сделано работает

Confectionery/ConfectioneryBusinessLogic/ImplementerLogic.cs

@@ -1,4 +1,9 @@
 using Microsoft.Extensions.Logging;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Confectionery/ConfectioneryBusinessLogic/OrderLogic.cs

@@ -17,6 +17,7 @@ namespace ConfectioneryBusinessLogic
 	{
 		private readonly ILogger _logger;
 		private readonly IOrderStorage _orderStorage;
+		static readonly object _locker = new object();
 		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
 		{
 			_logger = logger;
@@ -24,7 +25,8 @@ namespace ConfectioneryBusinessLogic
 		}
 		public List<OrderViewModel>? ReadList(OrderSearchModel? model)
 		{
-            _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
+			_logger.LogInformation("ReadList. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
+				model?.ClientId, model?.Status, model?.ImplementerId, model?.DateFrom, model?.DateTo, model?.Id);
 			var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
 			if (list == null)
 			{
@@ -49,9 +51,12 @@ namespace ConfectioneryBusinessLogic
 		}
 
 		public bool TakeOrderInWork(OrderBindingModel model)
+		{
+			lock (_locker)
 			{
 				return ChangeStatus(model, OrderStatus.Выполняется);
 			}
+		}
 
 		public bool FinishOrder(OrderBindingModel model)
 		{
@@ -75,7 +80,7 @@ namespace ConfectioneryBusinessLogic
 			}
 			if (model.Count <= 0)
 			{
-                throw new ArgumentException("Колличество кондитерских изделий в заказе не может быть меньше 1", nameof(model.Count));
+				throw new ArgumentException("Колличество суши в заказе не может быть меньше 1", nameof(model.Count));
 			}
 			if (model.Sum <= 0)
 			{
@@ -85,7 +90,7 @@ namespace ConfectioneryBusinessLogic
 			{
 				throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
 			}
-            _logger.LogInformation("Pastry. PastryId:{PastryId}.Count:{Count}.Sum:{Sum}Id:{Id}",
+			_logger.LogInformation("Sushi. SushiId:{SushiId}.Count:{Count}.Sum:{Sum}Id:{Id}",
 				model.PastryId, model.Count, model.Sum, model.Id);
 		}
 
@@ -98,19 +103,26 @@ namespace ConfectioneryBusinessLogic
 			});
 			if (element == null)
 			{
-                throw new ArgumentNullException(nameof(element));
+				throw new InvalidOperationException(nameof(element));
 			}
 			model.DateCreate = element.DateCreate;
 			model.PastryId = element.PastryId;
 			model.DateImplement = element.DateImplement;
+			model.ClientId = element.ClientId;
+			if (!model.ImplementerId.HasValue)
+			{
+				model.ImplementerId = element.ImplementerId;
+			}
 			model.Status = element.Status;
 			model.Count = element.Count;
 			model.Sum = element.Sum;
 			if (requiredStatus - model.Status == 1)
 			{
 				model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Выдан)
+				if (model.Status == OrderStatus.Готов)
+				{
 					model.DateImplement = DateTime.Now;
+				}
 				if (_orderStorage.Update(model) == null)
 				{
 					_logger.LogWarning("Update operation failed");
@@ -119,7 +131,26 @@ namespace ConfectioneryBusinessLogic
 				return true;
 			}
 			_logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new ArgumentException($"Невозможно присвоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+			throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+
+		}
+
+		public OrderViewModel? ReadElement(OrderSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
+				model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, 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;
 		}
 	}
 }

Confectionery/ConfectioneryContracts/BindingModels/ImplementerBindingModel.cs

@@ -1,4 +1,4 @@
-using ConfectioneryDataModels;
+using ConfectioneryDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Confectionery/ConfectioneryContracts/BindingModels/OrderBindingModel.cs

@@ -13,6 +13,7 @@ namespace ConfectioneryContracts.BindingModels
 		public int Id { get; set; }
 		public int PastryId { get; set; }
 		public int ClientId { get; set; }
+		public int? ImplementerId { get; set; }
 		public int Count { get; set; }
 		public double Sum { get; set; }
 		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IImplementerLogic.cs

@@ -1,4 +1,6 @@
 using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Confectionery/ConfectioneryContracts/StoragesContracts/IImplementerStorage.cs

@@ -1,5 +1,6 @@
 using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Confectionery/ConfectioneryContracts/ViewModels/ImplementerViewModel.cs

@@ -1,4 +1,4 @@
-using ConfectioneryDataModels;
+using ConfectioneryDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

Confectionery/ConfectioneryContracts/ViewModels/OrderViewModel.cs

@@ -17,6 +17,9 @@ namespace ConfectioneryContracts.ViewModels
 
 		[DisplayName("ФИО клиента")]
 		public string ClientFIO { get; set; } = string.Empty;
+		public int? ImplementerId { get; set; }
+		[DisplayName("Исполнитель")]
+		public string? ImplementerFIO { get; set; } = null;
 		public int PastryId { get; set; }
 		[DisplayName("Изделие")]
 		public string PastryName { get; set; } = string.Empty;

Confectionery/ConfectioneryDataModels/IOrderModel.cs

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

Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs

@@ -15,7 +15,7 @@ namespace ConfectioneryDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabaseNew;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabase11;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }

Confectionery/ConfectioneryDatabaseImplement/Implementer.cs

@@ -1,15 +1,15 @@
-using ConfectioneryContracts.BindingModels;
+using System;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-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;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 
-namespace ConfectioneryDatabaseImplement
+namespace ConfectioneryDatabaseImplement.Models
 {
 	public class Implementer : IImplementerModel
 	{

Confectionery/ConfectioneryDatabaseImplement/ImplementerStorage.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConfectioneryDatabaseImplement
+namespace ConfectioneryDatabaseImplement.Implements
 {
 	public class ImplementerStorage : IImplementerStorage
 	{

Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603191022_Implementers.Designer.cs

@@ -0,0 +1,257 @@
+// <auto-generated />
+using System;
+using ConfectioneryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+    [DbContext(typeof(ConfectioneryDatabase))]
+    [Migration("20240603191022_Implementers")]
+    partial class Implementers
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.17")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PastryId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
+                    b.HasIndex("PastryId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("PastryName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Pastrys");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PastryId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("PastryId");
+
+                    b.ToTable("PastryComponents");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+                        .WithMany("Orders")
+                        .HasForeignKey("PastryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
+                    b.Navigation("Pastry");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+                {
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Component", "Component")
+                        .WithMany("PastryComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+                        .WithMany("Components")
+                        .HasForeignKey("PastryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Pastry");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("PastryComponents");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603191022_Implementers.cs

@@ -0,0 +1,108 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class Implementers : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ClientId",
+                table: "Orders",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ImplementerId",
+                table: "Orders",
+                type: "int",
+                nullable: true);
+
+            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),
+                    WorkExperience = table.Column<int>(type: "int", nullable: false),
+                    Qualification = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Implementers_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId",
+                principalTable: "Implementers",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Implementers_ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "Implementers");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.DropColumn(
+                name: "ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ClientId",
+                table: "Orders",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Clients_ClientId",
+                table: "Orders",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id");
+        }
+    }
+}

Confectionery/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs

@@ -67,6 +67,33 @@ namespace ConfectioneryDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
             modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -75,7 +102,7 @@ namespace ConfectioneryDatabaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
-                    b.Property<int?>("ClientId")
+                    b.Property<int>("ClientId")
                         .HasColumnType("int");
 
                     b.Property<int>("Count")
@@ -87,6 +114,9 @@ namespace ConfectioneryDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("PastryId")
                         .HasColumnType("int");
 
@@ -100,6 +130,8 @@ namespace ConfectioneryDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("PastryId");
 
                     b.ToTable("Orders");
@@ -153,9 +185,15 @@ namespace ConfectioneryDatabaseImplement.Migrations
 
             modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", null)
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
                         .WithMany("Orders")
-                        .HasForeignKey("ClientId");
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ConfectioneryDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
 
                     b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
                         .WithMany("Orders")
@@ -163,6 +201,10 @@ namespace ConfectioneryDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
                     b.Navigation("Pastry");
                 });
 
@@ -195,6 +237,11 @@ namespace ConfectioneryDatabaseImplement.Migrations
                     b.Navigation("PastryComponents");
                 });
 
+            modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
             modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
                 {
                     b.Navigation("Components");

Confectionery/ConfectioneryDatabaseImplement/Order.cs

@@ -23,6 +23,8 @@ namespace ConfectioneryDatabaseImplement.Models
 		public int PastryId { get; private set; }
 
 		public virtual Pastry Pastry { get; set; } = new();
+		public int? ImplementerId { get; private set; }
+		public virtual Implementer? Implementer { get; set; } = new();
 
 		[Required]
 		public int Count { get; private set; }
@@ -47,6 +49,8 @@ namespace ConfectioneryDatabaseImplement.Models
 				Client = context.Clients.First(x => x.Id == model.ClientId),
 				PastryId = model.PastryId,
 				Pastry = context.Pastrys.First(x => x.Id == model.PastryId),
+				ImplementerId = model.ImplementerId,
+				Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
 				Count = model.Count,
 				Sum = model.Sum,
 				Status = model.Status,
@@ -55,7 +59,7 @@ namespace ConfectioneryDatabaseImplement.Models
 			};
 		}
 
-        public void Update(OrderBindingModel? model)
+		public void Update(ConfectioneryDatabase context, OrderBindingModel? model)
 		{
 			if (model == null)
 			{
@@ -63,6 +67,8 @@ namespace ConfectioneryDatabaseImplement.Models
 			}
 			Status = model.Status;
 			DateImplement = model.DateImplement;
+			ImplementerId = model.ImplementerId;
+			Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
 		}
 
 		public OrderViewModel GetViewModel => new()
@@ -72,6 +78,8 @@ namespace ConfectioneryDatabaseImplement.Models
 			ClientFIO = Client.ClientFIO,
 			PastryId = PastryId,
 			PastryName = Pastry.PastryName,
+			ImplementerId = ImplementerId,
+			ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
 			Count = Count,
 			Sum = Sum,
 			Status = Status,

Confectionery/ConfectioneryDatabaseImplement/OrderStorage.cs

@@ -17,31 +17,34 @@ namespace ConfectioneryDatabaseImplement.Implements
 		public List<OrderViewModel> GetFullList()
 		{
 			using var context = new ConfectioneryDatabase();
-            return context.Orders.Include(x => x.Pastry).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
+			return context.Orders.Include(x => x.Pastry).Include(x => x.Client).Include(y => y.Implementer).Select(x => x.GetViewModel).ToList();
 		}
 
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
 			using var context = new ConfectioneryDatabase();
-            if (model.DateFrom.HasValue)
+			if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue)
 			{
-                return context.Orders.Include(x => x.Pastry).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
+				return new();
 			}
-            if (model.ClientId.HasValue)
+			return context.Orders.Include(x => x.Pastry).Include(x => x.Client).Include(x => x.Implementer).Where(x =>
-            {
+				 (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) ||
-                return context.Orders.Include(x => x.Pastry).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
+				 (model.ClientId.HasValue && x.ClientId == model.ClientId) ||
-            }
+				 (model.Status.HasValue && x.Status == model.Status))
-            return context.Orders.Include(x => x.Pastry).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
+				 .Select(x => x.GetViewModel).ToList();
 		}
 
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue)
+			if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue))
 			{
 				return new();
 			}
 			using var context = new ConfectioneryDatabase();
-            return context.Orders.Include(x => x.Pastry).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+			return context.Orders.Include(x => x.Pastry).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>
+				(model.Id.HasValue && x.Id == model.Id) ||
+				(model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status))
+				?.GetViewModel;
 		}
 
 		public OrderViewModel? Insert(OrderBindingModel model)
@@ -67,7 +70,7 @@ namespace ConfectioneryDatabaseImplement.Implements
 			{
 				return null;
 			}
-            order.Update(model);
+			order.Update(context, model);
 			context.SaveChanges();
 			return order.GetViewModel;
 		}

Confectionery/ConfectioneryFileImplement/ImplementerStorage.cs

@@ -13,87 +13,81 @@ namespace ConfectioneryFileImplement.Implements
 {
 	public class ImplementerStorage : IImplementerStorage
 	{
-		private readonly DataFileSingleton _source;
+		private readonly DataFileSingleton source;
+
 		public ImplementerStorage()
 		{
-			_source = DataFileSingleton.GetInstance();
+			source = DataFileSingleton.GetInstance();
 		}
 
 		public List<ImplementerViewModel> GetFullList()
 		{
-			return _source.Implementers.Select(x => x.GetViewModel).ToList();
+			return source.Implementers
+					.Select(x => x.GetViewModel)
+					.ToList();
 		}
 
 		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
 		{
-			if (model == null)
+			if (string.IsNullOrEmpty(model.ImplementerFIO))
 			{
 				return new();
 			}
-			if (model.Id.HasValue)
+			return source.Implementers
-			{
+					.Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO))
-				var res = GetElement(model);
-				return res != null ? new() { res } : new();
-			}
-			if (model.ImplementerFIO != null)
-			{
-				return _source.Implementers
-					.Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
 					.Select(x => x.GetViewModel)
 					.ToList();
 		}
-			return new();
-		}
 
 		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
 		{
-			if (model.Id.HasValue)
+			if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue)
 			{
-				return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-			}
-			if (model.ImplementerFIO != null && model.Password != null)
-			{
-				return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))?.GetViewModel;
-			}
-			if (model.ImplementerFIO != null)
-			{
-				return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
-			}
 				return null;
 			}
+			return source.Implementers
+					.FirstOrDefault(x =>
+					(!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO
+					&& (string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
+					|| (model.Id.HasValue && x.Id == model.Id))
+					?.GetViewModel;
+		}
 
 		public ImplementerViewModel? Insert(ImplementerBindingModel model)
 		{
-			model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
+			model.Id = source.Implementers.Count > 0 ? source.Implementers.Max(x => x.Id) + 1 : 1;
-			var res = Implementer.Create(model);
+			var newImplementer = Implementer.Create(model);
-			if (res != null)
+			if (newImplementer == null)
 			{
-				_source.Implementers.Add(res);
+				return null;
-				_source.SaveImplementers();
 			}
-			return res?.GetViewModel;
+			source.Implementers.Add(newImplementer);
+			source.SaveImplementers();
+			return newImplementer.GetViewModel;
 		}
 
 		public ImplementerViewModel? Update(ImplementerBindingModel model)
 		{
-			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			var implementer = source.Implementers.FirstOrDefault(x => x.Id == model.Id);
-			if (res != null)
+			if (implementer == null)
 			{
-				res.Update(model);
+				return null;
-				_source.SaveImplementers();
 			}
-			return res?.GetViewModel;
+			implementer.Update(model);
+			source.SaveImplementers();
+			return implementer.GetViewModel;
 		}
 
 		public ImplementerViewModel? Delete(ImplementerBindingModel model)
 		{
-			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			var element = source.Implementers.FirstOrDefault(x => x.Id == model.Id);
-			if (res != null)
+			if (element != null)
 			{
-				_source.Implementers.Remove(res);
+				source.Implementers.Remove(element);
-				_source.SaveImplementers();
+				source.SaveImplementers();
+				return element.GetViewModel;
 			}
-			return res?.GetViewModel;
+			return null;
 		}
 	}
 }

Confectionery/ConfectioneryFileImplement/Order.cs

@@ -10,6 +10,7 @@ namespace ConfectioneryFileImplement.Models
 	{
 		public int Id { get; private set; }
 		public int ClientId { get; private set; }
+		public int? ImplementerId { get; set; }
 		public int PastryId { get; private set; }
 		public int Count { get; private set; }
 		public double Sum { get; private set; }
@@ -27,6 +28,8 @@ namespace ConfectioneryFileImplement.Models
 			{
 				Id = model.Id,
 				PastryId = model.PastryId,
+				ClientId = model.ClientId,
+				ImplementerId = model.ImplementerId,
 				Count = model.Count,
 				Sum = model.Sum,
 				Status = model.Status,
@@ -46,6 +49,8 @@ namespace ConfectioneryFileImplement.Models
 			{
 				Id = Convert.ToInt32(element.Attribute("Id")!.Value),
 				PastryId = Convert.ToInt32(element.Element("PastryId")!.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)),
@@ -68,6 +73,8 @@ namespace ConfectioneryFileImplement.Models
 		{
 			Id = Id,
 			PastryId = PastryId,
+			ClientId = ClientId,
+			ImplementerId = ImplementerId,
 			Count = Count,
 			Sum = Sum,
 			Status = Status,
@@ -78,6 +85,8 @@ namespace ConfectioneryFileImplement.Models
 		public XElement GetXElement => new("Order",
 		   new XAttribute("Id", Id),
 		   new XElement("PastryId", PastryId.ToString()),
+		   new XElement("ClientId", ClientId.ToString()),
+		   new XElement("ImplementerId", ImplementerId),
 		   new XElement("Count", Count.ToString()),
 		   new XElement("Sum", Sum.ToString()),
 		   new XElement("Status", Status.ToString()),

Confectionery/ConfectioneryFileImplement/OrderStorage.cs

@@ -1,13 +1,13 @@
-using ConfectioneryContracts.BindingModels;
+using System;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryFileImplement.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
 
 namespace ConfectioneryFileImplement.Implements
 {
@@ -20,24 +20,64 @@ namespace ConfectioneryFileImplement.Implements
 			source = DataFileSingleton.GetInstance();
 		}
 
-        public List<OrderViewModel> GetFullList() => source.Orders.Select(x => AttachPastryName(x.GetViewModel)).ToList();
+		public List<OrderViewModel> GetFullList()
+		{
+			return source.Orders
+					.Select(x => AddInfo(x.GetViewModel))
+					.ToList();
+		}
 
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue)
+			if (model.Id.HasValue)
 			{
-                return new();
+				return source.Orders
+							  .Where(x => x.Id == model.Id)
+							  .Select(x => AddInfo(x.GetViewModel))
+							  .ToList();
 			}
-            return source.Orders.Where(x => x.Id == model.Id).Select(x => AttachPastryName(x.GetViewModel)).ToList();
+			else if (model.DateFrom.HasValue && model.DateTo.HasValue)
+			{
+				return source.Orders
+							  .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+							  .Select(x => AddInfo(x.GetViewModel))
+							  .ToList();
+			}
+			else if (model.ClientId.HasValue)
+			{
+				return source.Orders
+							  .Where(x => x.ClientId == model.ClientId)
+							  .Select(x => AddInfo(x.GetViewModel))
+							  .ToList();
+			}
+			else if (model.ImplementerId.HasValue)
+			{
+				return source.Orders
+							  .Where(x => x.ImplementerId == model.ImplementerId)
+							  .Select(x => AddInfo(x.GetViewModel))
+							  .ToList();
+			}
+			else if (model.Status != null)
+			{
+				return source.Orders
+							  .Where(x => x.Status.Equals(model.Status))
+							  .Select(x => AddInfo(x.GetViewModel))
+							  .ToList();
+			}
+			return new();
 		}
 
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue)
+			if (!model.Id.HasValue && !model.ImplementerId.HasValue)
 			{
-                return new();
+				return null;
 			}
-            return AttachPastryName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
+			var order = source.Orders.FirstOrDefault(x =>
+				model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && model.Status != null && x.Status.Equals(model.Status)
+				|| model.Status == null && model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId
+				|| model.Id.HasValue && x.Id == model.Id);
+			return order?.GetViewModel != null ? AddInfo(order.GetViewModel) : null;
 		}
 
 		public OrderViewModel? Insert(OrderBindingModel model)
@@ -50,7 +90,7 @@ namespace ConfectioneryFileImplement.Implements
 			}
 			source.Orders.Add(newOrder);
 			source.SaveOrders();
-            return AttachPastryName(newOrder.GetViewModel);
+			return AddInfo(newOrder.GetViewModel);
 		}
 
 		public OrderViewModel? Update(OrderBindingModel model)
@@ -62,32 +102,27 @@ namespace ConfectioneryFileImplement.Implements
 			}
 			order.Update(model);
 			source.SaveOrders();
-            return AttachPastryName(order.GetViewModel);
+			return AddInfo(order.GetViewModel);
 		}
 
 		public OrderViewModel? Delete(OrderBindingModel model)
 		{
-            var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+			var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order != null)
+			if (element != null)
 			{
-                source.Orders.Remove(order);
+				source.Orders.Remove(element);
 				source.SaveOrders();
-                return AttachPastryName(order.GetViewModel);
+				return AddInfo(element.GetViewModel);
 			}
 			return null;
 		}
 
-        private OrderViewModel? AttachPastryName(OrderViewModel? model)
+		private OrderViewModel AddInfo(OrderViewModel model)
 		{
-            if (model == null)
+			var selectedPastry = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId);
-            {
+			model.PastryName = selectedPastry?.PastryName ?? string.Empty;
-                return null;
+			var selectedClient = source.Clients.FirstOrDefault(x => x.Id == model.ClientId);
-            }
+			model.ClientFIO = selectedClient?.ClientFIO ?? string.Empty;
-            var pastry = source.Pastrys.FirstOrDefault(x => x.Id == model.PastryId);
-            if (pastry != null)
-            {
-                model.PastryName = pastry.PastryName;
-            }
 			return model;
 		}
 	}

Confectionery/ConfectioneryListImplement/DataListSingleton.cs

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

Confectionery/ConfectioneryListImplement/ImplementerStorage.cs

@@ -2,6 +2,7 @@
 using ConfectioneryContracts.SearchModels;
 using ConfectioneryContracts.StoragesContracts;
 using ConfectioneryContracts.ViewModels;
+using ConfectioneryListImplement.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Confectionery/ConfectioneryListImplement/Order.cs

@@ -15,6 +15,7 @@ namespace ConfectioneryListImplement.Models
 		public int Id { get; private set; }
 		public int PastryId { 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; } = OrderStatus.Неизвестен;
@@ -31,6 +32,8 @@ namespace ConfectioneryListImplement.Models
 			{
 				Id = model.Id,
 				PastryId = model.PastryId,
+				ClientId = model.ClientId,
+				ImplementerId = model.ImplementerId,
 				Count = model.Count,
 				Sum = model.Sum,
 				Status = model.Status,
@@ -53,6 +56,8 @@ namespace ConfectioneryListImplement.Models
 		{
 			Id = Id,
 			PastryId = PastryId,
+			ClientId = ClientId,
+			ImplementerId = ImplementerId,
 			Count = Count,
 			Sum = Sum,
 			Status = Status,

Confectionery/ConfectioneryListImplement/OrderStorage.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ConfectioneryListImplement
+namespace ConfectioneryListImplement.Implements
 {
 	public class OrderStorage : IOrderStorage
 	{
@@ -25,7 +25,7 @@ namespace ConfectioneryListImplement
 			var result = new List<OrderViewModel>();
 			foreach (var order in _source.Orders)
 			{
-                result.Add(AttachPastryName(order.GetViewModel));
+				result.Add(AddInfo(order.GetViewModel));
 			}
 			return result;
 		}
@@ -33,15 +33,54 @@ namespace ConfectioneryListImplement
 		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
 		{
 			var result = new List<OrderViewModel>();
-            if (model == null || !model.Id.HasValue)
+			if (model.Id.HasValue)
 			{
-                return result;
-            }
 				foreach (var order in _source.Orders)
 				{
 					if (order.Id == model.Id)
 					{
-                    result.Add(AttachPastryName(order.GetViewModel));
+						result.Add(AddInfo(order.GetViewModel));
+					}
+				}
+			}
+			else if (model.DateFrom.HasValue && model.DateTo.HasValue)
+			{
+				foreach (var order in _source.Orders)
+				{
+					if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
+					{
+						result.Add(AddInfo(order.GetViewModel));
+					}
+				}
+			}
+			else if (model.ClientId.HasValue)
+			{
+				foreach (var order in _source.Orders)
+				{
+					if (order.ClientId == model.ClientId)
+					{
+						result.Add(AddInfo(order.GetViewModel));
+					}
+				}
+			}
+			else if (model.ImplementerId.HasValue)
+			{
+				foreach (var order in _source.Orders)
+				{
+					if (order.ImplementerId == model.ImplementerId)
+					{
+						result.Add(AddInfo(order.GetViewModel));
+					}
+				}
+			}
+			else if (model.Status != null)
+			{
+				foreach (var order in _source.Orders)
+				{
+					if (order.Status.Equals(model.Status))
+					{
+						result.Add(AddInfo(order.GetViewModel));
+					}
 				}
 			}
 			return result;
@@ -49,15 +88,23 @@ namespace ConfectioneryListImplement
 
 		public OrderViewModel? GetElement(OrderSearchModel model)
 		{
-            if (!model.Id.HasValue)
+			if (!model.Id.HasValue && !model.ImplementerId.HasValue)
 			{
 				return null;
 			}
 			foreach (var order in _source.Orders)
 			{
-                if (model.Id.HasValue && order.Id == model.Id)
+				if (order.Id == model.Id)
 				{
-                    return AttachPastryName(order.GetViewModel);
+					return AddInfo(order.GetViewModel);
+				}
+				if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && order.Status.Equals(model.Status))
+				{
+					return AddInfo(order.GetViewModel);
+				}
+				if (model.ImplementerId.HasValue && model.Status == null && order.ImplementerId == model.ImplementerId)
+				{
+					return AddInfo(order.GetViewModel);
 				}
 			}
 			return null;
@@ -79,7 +126,7 @@ namespace ConfectioneryListImplement
 				return null;
 			}
 			_source.Orders.Add(newOrder);
-            return AttachPastryName(newOrder.GetViewModel);
+			return AddInfo(newOrder.GetViewModel);
 		}
 
 		public OrderViewModel? Update(OrderBindingModel model)
@@ -89,7 +136,7 @@ namespace ConfectioneryListImplement
 				if (order.Id == model.Id)
 				{
 					order.Update(model);
-                    return AttachPastryName(order.GetViewModel);
+					return AddInfo(order.GetViewModel);
 				}
 			}
 			return null;
@@ -103,20 +150,25 @@ namespace ConfectioneryListImplement
 				{
 					var element = _source.Orders[i];
 					_source.Orders.RemoveAt(i);
-                    return AttachPastryName(element.GetViewModel);
+					return AddInfo(element.GetViewModel);
 				}
 			}
 			return null;
 		}
 
-        private OrderViewModel AttachPastryName(OrderViewModel model)
+		private OrderViewModel AddInfo(OrderViewModel model)
 		{
-            foreach (var Pastry in _source.Pastrys)
+			var selectedPastry = _source.Pastrys.Find(pastry => pastry.Id == model.PastryId);
+			if (selectedPastry != null)
 			{
-                if (Pastry.Id == model.PastryId)
+				model.PastryName = selectedPastry.PastryName;
+			}
+			foreach (var client in _source.Clients)
 			{
-                    model.PastryName = Pastry.PastryName;
+				if (client.Id == model.ClientId)
-                    return model;
+				{
+					model.ClientFIO = client.ClientFIO;
+					break;
 				}
 			}
 			return model;

Confectionery/ConfectioneryRestApi/Program.cs

@@ -15,6 +15,8 @@ builder.Services.AddTransient<IPastryStorage, PastryStorage>();
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IPastryLogic, PastryLogic>();
+builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
+builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
 builder.Services.AddControllers();
 
 // Learn more about configuring Swagger/OpenAPI at

Confectionery/ConfectioneryView/FormImplementers.Designer.cs

@@ -0,0 +1,113 @@
+namespace ConfectioneryView
+{
+	partial class FormImplementers
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			dataGridView = new DataGridView();
+			buttonAdd = new Button();
+			buttonUpd = new Button();
+			buttonDel = new Button();
+			buttonRef = new Button();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(12, 12);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowHeadersWidth = 62;
+			dataGridView.Size = new Size(768, 492);
+			dataGridView.TabIndex = 0;
+			// 
+			// buttonAdd
+			// 
+			buttonAdd.Location = new Point(849, 59);
+			buttonAdd.Name = "buttonAdd";
+			buttonAdd.Size = new Size(112, 34);
+			buttonAdd.TabIndex = 1;
+			buttonAdd.Text = "Добавить";
+			buttonAdd.UseVisualStyleBackColor = true;
+			buttonAdd.Click += buttonAdd_Click;
+			// 
+			// buttonUpd
+			// 
+			buttonUpd.Location = new Point(849, 137);
+			buttonUpd.Name = "buttonUpd";
+			buttonUpd.Size = new Size(112, 34);
+			buttonUpd.TabIndex = 2;
+			buttonUpd.Text = "Изменить";
+			buttonUpd.UseVisualStyleBackColor = true;
+			buttonUpd.Click += buttonUpd_Click;
+			// 
+			// buttonDel
+			// 
+			buttonDel.Location = new Point(849, 218);
+			buttonDel.Name = "buttonDel";
+			buttonDel.Size = new Size(112, 34);
+			buttonDel.TabIndex = 3;
+			buttonDel.Text = "Удалить";
+			buttonDel.UseVisualStyleBackColor = true;
+			buttonDel.Click += buttonDel_Click;
+			// 
+			// buttonRef
+			// 
+			buttonRef.Location = new Point(849, 296);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(112, 34);
+			buttonRef.TabIndex = 4;
+			buttonRef.Text = "Обновить";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += buttonRef_Click;
+			// 
+			// FormImplementers
+			// 
+			AutoScaleDimensions = new SizeF(10F, 25F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(1028, 516);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonDel);
+			Controls.Add(buttonUpd);
+			Controls.Add(buttonAdd);
+			Controls.Add(dataGridView);
+			Name = "FormImplementers";
+			Text = "Исполнители";
+			Load += FormImplementers_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private DataGridView dataGridView;
+		private Button buttonAdd;
+		private Button buttonUpd;
+		private Button buttonDel;
+		private Button buttonRef;
+	}
+}

Confectionery/ConfectioneryView/FormImplementers.cs

@@ -0,0 +1,118 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ConfectioneryView
+{
+	public partial class FormImplementers : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IImplementerLogic _logic;
+
+		public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic implementerLogic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logic = implementerLogic;
+		}
+
+		private void LoadData()
+		{
+			try
+			{
+				var list = _logic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["Id"].Visible = false;
+					dataGridView.Columns["ImplementerFIO"].AutoSizeMode =
+					DataGridViewAutoSizeColumnMode.Fill;
+				}
+				_logger.LogInformation("Загрузка исполнителей");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки исполнителей");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+				MessageBoxIcon.Error);
+			}
+		}
+
+		private void FormImplementers_Load(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+
+		private void buttonAdd_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+			if (service is FormImplementer form)
+			{
+				if (form.ShowDialog() == DialogResult.OK)
+				{
+					LoadData();
+				}
+			}
+		}
+
+		private void buttonUpd_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+				if (service is FormImplementer form)
+				{
+					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					if (form.ShowDialog() == DialogResult.OK)
+					{
+						LoadData();
+					}
+				}
+			}
+		}
+
+		private void buttonDel_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				if (MessageBox.Show("Удалить запись?", "Вопрос",
+				MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+				{
+					int id = Convert.ToInt32(dataGridView.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 buttonRef_Click(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+	}
+}

Confectionery/ConfectioneryView/FormImplementers.resx

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

Confectionery/ConfectioneryView/FormMain.Designer.cs

@@ -38,12 +38,13 @@
 			pastrysListToolStripMenuItem = new ToolStripMenuItem();
 			componentPastryToolStripMenuItem = new ToolStripMenuItem();
 			ordersListToolStripMenuItem = new ToolStripMenuItem();
+			startWorkToolStripMenuItem = new ToolStripMenuItem();
 			buttonCreateOrder = new Button();
 			buttonTakeOrderInWork = new Button();
 			buttonOrderReady = new Button();
 			buttonIssuedOrder = new Button();
 			buttonRef = new Button();
-			startWorkToolStripMenuItem = new ToolStripMenuItem();
+			implementersToolStripMenuItem = new ToolStripMenuItem();
 			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
 			menuStrip.SuspendLayout();
 			SuspendLayout();
@@ -70,7 +71,7 @@
 			// 
 			// toolStripMenuItem
 			// 
-			toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, pastryToolStripMenuItem, clientsToolStripMenuItem });
+			toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, pastryToolStripMenuItem, clientsToolStripMenuItem, implementersToolStripMenuItem });
 			toolStripMenuItem.Name = "toolStripMenuItem";
 			toolStripMenuItem.Size = new Size(139, 29);
 			toolStripMenuItem.Text = "Справочники";
@@ -124,6 +125,13 @@
 			ordersListToolStripMenuItem.Text = "Список заказов";
 			ordersListToolStripMenuItem.Click += ordersListToolStripMenuItem_Click;
 			// 
+			// startWorkToolStripMenuItem
+			// 
+			startWorkToolStripMenuItem.Name = "startWorkToolStripMenuItem";
+			startWorkToolStripMenuItem.Size = new Size(136, 29);
+			startWorkToolStripMenuItem.Text = "Запуск работ";
+			startWorkToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
+			// 
 			// buttonCreateOrder
 			// 
 			buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -179,12 +187,12 @@
 			buttonRef.UseVisualStyleBackColor = true;
 			buttonRef.Click += buttonRef_Click;
 			// 
-			// startWorkToolStripMenuItem
+			// implementersToolStripMenuItem
 			// 
-			startWorkToolStripMenuItem.Name = "startWorkToolStripMenuItem";
+			implementersToolStripMenuItem.Name = "implementersToolStripMenuItem";
-			startWorkToolStripMenuItem.Size = new Size(136, 29);
+			implementersToolStripMenuItem.Size = new Size(298, 34);
-			startWorkToolStripMenuItem.Text = "Запуск работ";
+			implementersToolStripMenuItem.Text = "Исполнители";
-			startWorkToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
+			implementersToolStripMenuItem.Click += implementersToolStripMenuItem_Click_1;
 			// 
 			// FormMain
 			// 
@@ -227,5 +235,6 @@
         private ToolStripMenuItem ordersListToolStripMenuItem;
 		private ToolStripMenuItem clientsToolStripMenuItem;
 		private ToolStripMenuItem startWorkToolStripMenuItem;
+		private ToolStripMenuItem implementersToolStripMenuItem;
 	}
 }

Confectionery/ConfectioneryView/FormMain.cs

@@ -43,6 +43,7 @@ namespace ConfectioneryView
 					dataGridView.DataSource = list;
 					dataGridView.Columns["PastryId"].Visible = false;
 					dataGridView.Columns["ClientId"].Visible = false;
+					dataGridView.Columns["ImplementerId"].Visible = false;
 					dataGridView.Columns["PastryName"].AutoSizeMode =
 					DataGridViewAutoSizeColumnMode.Fill;
 				}
@@ -211,5 +212,14 @@ namespace ConfectioneryView
 			_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
 			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
+
+		private void implementersToolStripMenuItem_Click_1(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+			if (service is FormImplementers form)
+			{
+				form.ShowDialog();
+			}
+		}
 	}
 }

Confectionery/ConfectioneryView/Program.cs

@@ -7,6 +7,8 @@ using ConfectioneryDatabaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
+using ConfectioneryBusinessLogic.BusinessLogics;
+using Microsoft.EntityFrameworkCore.Design;
 
 namespace ConfectioneryView
 {
@@ -38,11 +40,14 @@ namespace ConfectioneryView
 			services.AddTransient<IOrderStorage, OrderStorage>();
 			services.AddTransient<IPastryStorage, PastryStorage>();
 			services.AddTransient<IClientStorage, ClientStorage>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
 			services.AddTransient<IClientLogic, ClientLogic>();
 			services.AddTransient<IComponentLogic, ComponentLogic>();
 			services.AddTransient<IOrderLogic, OrderLogic>();
 			services.AddTransient<IPastryLogic, PastryLogic>();
 			services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IWorkProcess, WorkModeling>();
 			services.AddTransient<AbstractSaveToWord, SaveToWord>();
 			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
 			services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
@@ -56,6 +61,9 @@ namespace ConfectioneryView
 			services.AddTransient<FormReportPastryComponents>();
 			services.AddTransient<FormReportOrders>();
 			services.AddTransient<FormClients>();
+			services.AddTransient<FormImplementers>();
+			services.AddTransient<FormImplementer>();
+			services.AddTransient<EntityFrameworkDesignServicesBuilder>();
 		}
 	}
 }