Всё работает

FoodOrders/FoodOrders/FormMain.cs

@@ -34,6 +34,7 @@ namespace FoodOrdersView
                     dataGridView.DataSource = list;
                     dataGridView.Columns["DishId"].Visible = false;
                     dataGridView.Columns["ClientId"].Visible = false;
+                    dataGridView.Columns["ImplementerId"].Visible = false;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }

FoodOrders/FoodOrders/Program.cs

@@ -69,6 +69,8 @@ namespace FoodOrdersView
             services.AddTransient<FormDishes>();
             services.AddTransient<FormReportDishComponents>();
             services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormViewImplementers>();
+            services.AddTransient<FormImplementer>();
         }
     }
 }

FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -1,35 +1,123 @@
 using FoodOrdersContracts.BindingModels;
 using FoodOrdersContracts.BusinessLogicsContracts;
 using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.StoragesContracts;
 using FoodOrdersContracts.ViewModels;
+using Microsoft.Extensions.Logging;
 
 namespace FoodOrdersBusinessLogic.BusinessLogics
 {
     public class ImplementerLogic : IImplementerLogic
     {
+        private readonly ILogger _logger;
+        private readonly IImplementerStorage _implementerStorage;
+        public ImplementerLogic(ILogger<ImplementerLogic> logger, IImplementerStorage implementerStorage)
+        {
+            _logger = logger;
+            _implementerStorage = implementerStorage;
+        }
+
         public bool Create(ImplementerBindingModel model)
         {
-            throw new NotImplementedException();
+            CheckModel(model);
+            if (_implementerStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
         }
 
         public bool Delete(ImplementerBindingModel model)
         {
-            throw new NotImplementedException();
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_implementerStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
         }
 
         public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
         {
-            throw new NotImplementedException();
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. FIO:{FIO}.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 List<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
         {
-            throw new NotImplementedException();
+            _logger.LogInformation("ReadList. FIO:{FIO}.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 bool Update(ImplementerBindingModel model)
         {
-            throw new NotImplementedException();
+            CheckModel(model);
+            if (_implementerStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update 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 (model.WorkExperience < 0)
+            {
+                throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience));
+            }
+            if (model.Qualification < 0)
+            {
+                throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification));
+            }
+            if (string.IsNullOrEmpty(model.Password))
+            {
+                throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO));
+            }
+            if (string.IsNullOrEmpty(model.ImplementerFIO))
+            {
+                throw new ArgumentNullException("Нет фио исполнителя", nameof(model.ImplementerFIO));
+            }
+            _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO);
+            var element = _implementerStorage.GetElement(new ImplementerSearchModel
+            {
+                ImplementerFIO = model.ImplementerFIO,
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Исполнитель с таким фио уже есть");
+            }
         }
     }
 }

FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -74,7 +74,8 @@ namespace FoodOrdersBusinessLogic.BusinessLogics
                         _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
                         _orderLogic.FinishOrder(new OrderBindingModel
                         {
-                            Id = order.Id
+                            Id = order.Id,
+                            ImplementerId = implementer.Id
                         });
                     }
                     // кто-то мог уже перехватить заказ, игнорируем ошибку

FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs

@@ -19,6 +19,8 @@ namespace FoodOrdersContracts.ViewModels
         public string ClientFIO { get; set; } = string.Empty;
 
         [DisplayName("Исполнитель")]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
         public int? ImplementerId { get; set; }
 
         [DisplayName("Количество")]

FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabase.cs

@@ -9,7 +9,7 @@ namespace FoodOrdersDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-SINQU55\SQLEXPRESS;Initial Catalog=FoodOrdersDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-SINQU55\SQLEXPRESS;Initial Catalog=FoodOrdersDatabase1;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }

FoodOrders/FoodOrdersDatabaseImplement/Implements/OrderStorage.cs

@@ -15,13 +15,14 @@ namespace FoodOrdersDatabaseImplement.Implements
             return context.Orders
                     .Include(x => x.Dish)
                     .Include(x => x.Client)
+                    .Include(x => x.Implementer)
                     .Select(x => x.GetViewModel)
                     .ToList();
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.ClientId.HasValue)
+            if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.ClientId.HasValue && !model.Status.HasValue)
             {
                 return new();
             }
@@ -31,6 +32,7 @@ namespace FoodOrdersDatabaseImplement.Implements
                 return context.Orders
                     .Include(x => x.Dish)
                     .Include(x => x.Client)
+                    .Include(x => x.Implementer)
                     .Where(x => x.ClientId == model.ClientId)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -40,13 +42,25 @@ namespace FoodOrdersDatabaseImplement.Implements
                 return context.Orders
                 .Include(x => x.Dish)
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
                 .Select(x => x.GetViewModel)
                 .ToList();
             }
+            else if (model.Status != null)
+            {
                 return context.Orders
                     .Include(x => x.Dish)
                     .Include(x => x.Client)
+                    .Include(x => x.Implementer)
+                    .Where(x => model.Status == x.Status)
+                    .Select(x => x.GetViewModel)
+                    .ToList(); ;
+            }
+            return context.Orders
+                .Include(x => x.Dish)
+                .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .Where(x => x.Id == model.Id)
                 .Select(x => x.GetViewModel)
                 .ToList();
@@ -62,6 +76,7 @@ namespace FoodOrdersDatabaseImplement.Implements
             return context.Orders
                 .Include(x => x.Dish)
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
                 ?.GetViewModel;
         }
@@ -79,6 +94,7 @@ namespace FoodOrdersDatabaseImplement.Implements
             return context.Orders
                 .Include(x => x.Dish)
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .FirstOrDefault(x => x.Id == newOrder.Id)
                  ?.GetViewModel;
         }
@@ -96,6 +112,7 @@ namespace FoodOrdersDatabaseImplement.Implements
             return context.Orders
                 .Include(x => x.Dish)
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .FirstOrDefault(x => x.Id == order.Id)
                  ?.GetViewModel;
         }

FoodOrders/FoodOrdersDatabaseImplement/Migrations/20230409213338_6b.Designer.cs

@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace FoodOrdersDatabaseImplement.Migrations
 {
     [DbContext(typeof(FoodOrdersDatabase))]
-    [Migration("20230409151800_5Base")]
+    [Migration("20230409213338_6b")]
-    partial class _5Base
+    partial class _6b
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -116,6 +116,33 @@ namespace FoodOrdersDatabaseImplement.Migrations
                     b.ToTable("DishComponents");
                 });
 
+            modelBuilder.Entity("FoodOrdersDatabaseImplement.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("FoodOrdersDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -139,6 +166,9 @@ namespace FoodOrdersDatabaseImplement.Migrations
                     b.Property<int>("DishId")
                         .HasColumnType("int");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -151,6 +181,8 @@ namespace FoodOrdersDatabaseImplement.Migrations
 
                     b.HasIndex("DishId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.ToTable("Orders");
                 });
 
@@ -187,9 +219,15 @@ namespace FoodOrdersDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("FoodOrdersDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
                     b.Navigation("Client");
 
                     b.Navigation("Dish");
+
+                    b.Navigation("Implementer");
                 });
 
             modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.Client", b =>
@@ -208,6 +246,11 @@ namespace FoodOrdersDatabaseImplement.Migrations
 
                     b.Navigation("Orders");
                 });
+
+            modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
 #pragma warning restore 612, 618
         }
     }

FoodOrders/FoodOrdersDatabaseImplement/Migrations/20230409213338_6b.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace FoodOrdersDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class _5Base : Migration
+    public partial class _6b : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -54,6 +54,22 @@ namespace FoodOrdersDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Dishes", 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),
+                    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.CreateTable(
                 name: "DishComponents",
                 columns: table => new
@@ -89,6 +105,7 @@ namespace FoodOrdersDatabaseImplement.Migrations
                         .Annotation("SqlServer:Identity", "1, 1"),
                     DishId = table.Column<int>(type: "int", nullable: false),
                     ClientId = table.Column<int>(type: "int", nullable: false),
+                    ImplementerId = table.Column<int>(type: "int", nullable: true),
                     Count = table.Column<int>(type: "int", nullable: false),
                     Sum = table.Column<double>(type: "float", nullable: false),
                     Status = table.Column<int>(type: "int", nullable: false),
@@ -110,6 +127,11 @@ namespace FoodOrdersDatabaseImplement.Migrations
                         principalTable: "Dishes",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Orders_Implementers_ImplementerId",
+                        column: x => x.ImplementerId,
+                        principalTable: "Implementers",
+                        principalColumn: "Id");
                 });
 
             migrationBuilder.CreateIndex(
@@ -131,6 +153,11 @@ namespace FoodOrdersDatabaseImplement.Migrations
                 name: "IX_Orders_DishId",
                 table: "Orders",
                 column: "DishId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
         }
 
         /// <inheritdoc />
@@ -150,6 +177,9 @@ namespace FoodOrdersDatabaseImplement.Migrations
 
             migrationBuilder.DropTable(
                 name: "Dishes");
+
+            migrationBuilder.DropTable(
+                name: "Implementers");
         }
     }
 }

FoodOrders/FoodOrdersDatabaseImplement/Migrations/FoodOrdersDatabaseModelSnapshot.cs

@@ -113,6 +113,33 @@ namespace FoodOrdersDatabaseImplement.Migrations
                     b.ToTable("DishComponents");
                 });
 
+            modelBuilder.Entity("FoodOrdersDatabaseImplement.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("FoodOrdersDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -136,6 +163,9 @@ namespace FoodOrdersDatabaseImplement.Migrations
                     b.Property<int>("DishId")
                         .HasColumnType("int");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -148,6 +178,8 @@ namespace FoodOrdersDatabaseImplement.Migrations
 
                     b.HasIndex("DishId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.ToTable("Orders");
                 });
 
@@ -184,9 +216,15 @@ namespace FoodOrdersDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("FoodOrdersDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
                     b.Navigation("Client");
 
                     b.Navigation("Dish");
+
+                    b.Navigation("Implementer");
                 });
 
             modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.Client", b =>
@@ -205,6 +243,11 @@ namespace FoodOrdersDatabaseImplement.Migrations
 
                     b.Navigation("Orders");
                 });
+
+            modelBuilder.Entity("FoodOrdersDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
 #pragma warning restore 612, 618
         }
     }

FoodOrders/FoodOrdersDatabaseImplement/Models/Order.cs

@@ -33,6 +33,8 @@ namespace FoodOrdersDatabaseImplement.Models
 
         public virtual Client Client { get; set; }
 
+        public Implementer? Implementer { get; private set; }
+
         public DateTime? DateImplement { get; set; }
 
         public static Order? Create(OrderBindingModel? model)
@@ -73,6 +75,7 @@ namespace FoodOrdersDatabaseImplement.Models
             ClientId = ClientId,
             ImplementerId = ImplementerId,
             ClientFIO = Client.ClientFIO,
+            ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
             Count = Count,
             Sum = Sum,
             Status = Status,

FoodOrders/FoodOrdersFileImplement/Models/Order.cs

@@ -74,6 +74,7 @@ namespace FoodOrdersFileImplement.Models
             Id = Id,
             DishId = DishId,
             ClientId = ClientId,
+            ImplementerFIO = DataFileSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
             Count = Count,
             Sum = Sum,
             Status = Status,

FoodOrders/FoodOrdersListImplement/Models/Order.cs

@@ -52,6 +52,7 @@ namespace FoodOrdersListImplement.Models
             Id = Id,
             DishId = DishId,
             ClientId = ClientId,
+            ImplementerFIO = DataListSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
             Count = Count,
             Sum = Sum,
             Status = Status,