+

FishFactory/FishFactory.csproj

@@ -45,6 +45,9 @@
     <None Update="App.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="ReportOrders.rdlc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -81,8 +81,8 @@ namespace FishFactoryBusinessLogic.BusinessLogic
 
         public bool TakeOrderInWork(OrderBindingModel model)
         {
-            return ToNextStatus(model, OrderStatus.Выполняется);
+			return ToNextStatus(model, OrderStatus.Выполняется);
-        }
+		}
 
         public bool FinishOrder(OrderBindingModel model)
         {
@@ -106,6 +106,11 @@ namespace FishFactoryBusinessLogic.BusinessLogic
                 throw new ArgumentNullException(nameof(element));
             }
 
+			if (element.ImplementerId != null && model.ImplementerId != null && model.ImplementerId != element.ImplementerId)
+			{
+				throw new InvalidOperationException(nameof(model.ImplementerId));
+			}
+
 			model.CannedId = element.CannedId;
             model.ClientId = element.ClientId;
             model.DateCreate = element.DateCreate;
@@ -113,8 +118,9 @@ namespace FishFactoryBusinessLogic.BusinessLogic
             model.Status = element.Status;
             model.Count = element.Count;
             model.Sum = element.Sum;
+			model.ImplementerId = element.ImplementerId.HasValue ? element.ImplementerId : model.ImplementerId;
 
-            if (model.Status != orderStatus - 1)
+			if (model.Status != orderStatus - 1)
             {
                 _logger.LogWarning("Status update to " + orderStatus + " operation failed");
                 return false;

FishFactoryBusinessLogic/BusinessLogic/WorkModeling.cs

@@ -31,9 +31,8 @@ namespace FishFactoryBusinessLogic.BusinessLogic
                 return;
             }
             var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
-            var processingOrders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Выполняется });
 
-            if (orders == null || processingOrders == null || (orders.Count == 0 && processingOrders.Count == 0))
+            if (orders == null || orders.Count == 0)
             {
                 _logger.LogWarning("DoWork. Orders is null or empty");
                 return;
@@ -78,7 +77,8 @@ namespace FishFactoryBusinessLogic.BusinessLogic
                         {
                             Id = order.Id
                         });
-                    }
+						Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+					}
                     // кто-то мог уже перехватить заказ, игнорируем ошибку
                     catch (InvalidOperationException ex)
                     {
@@ -91,7 +91,7 @@ namespace FishFactoryBusinessLogic.BusinessLogic
                         throw;
                     }
                     // отдыхаем
-                    Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+                    
                 }
             });
         }
@@ -104,7 +104,7 @@ namespace FishFactoryBusinessLogic.BusinessLogic
             }
             try
             {
-                var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
+                var runOrder = await Task.Run(() => _orderLogic.ReadElement(new()
                 {
                     ImplementerId = implementer.Id,
                     Status = OrderStatus.Выполняется

FishFactoryContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -1,11 +1,6 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FishFactoryContracts.BusinessLogicsContracts
 {

FishFactoryContracts/SearchModels/ImplementerSearchModel.cs

@@ -4,7 +4,7 @@ namespace FishFactoryContracts.SearchModels
     public class ImplementerSearchModel
     {
         public int? Id { get; set; }
-        public string? ImplementerFIO { get; set; }
+		public string? ImplementerFIO { get; set; } = string.Empty;
-        public string? Password { get; set; }
+		public string? Password { get; set; } = string.Empty;
-    }
+	}
 }

FishFactoryContracts/ViewModels/ImplementerViewModel.cs

@@ -1,8 +1,9 @@
 using FishFactoryContracts.Attributes;
+using FishFactoryDataModel.Models;
 
 namespace FishFactoryContracts.ViewModels
 {
-    public class ImplementerViewModel
+    public class ImplementerViewModel : IImplementerModel
     {
 		[Column(visible: false)]
 		public int Id { get; set; }

FishFactoryDatabaseImplement/Implements/ImplementerStorage.cs

@@ -26,9 +26,9 @@ namespace FishFactoryDatabaseImplement.Implements
 
         public ImplementerViewModel? GetElement(ImplementerSearchModel model)
         {
-			if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) &&
+            if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) &&
 			   !model.Id.HasValue)
-			{
+            {
                 return null;
             }
             using var context = new FishFactoryDatabase();

FishFactoryDatabaseImplement/Implements/OrderStorage.cs

@@ -22,7 +22,7 @@ namespace FishFactoryDatabaseImplement.Implements
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             using var context = new FishFactoryDatabase();
-            return context.Orders
+			return context.Orders
                 .Include(x => x.Canned)
                 .Include(x => x.Client)
                 .Include(x => x.Implementer)
@@ -43,7 +43,7 @@ namespace FishFactoryDatabaseImplement.Implements
 				return null;
 			}
 			using var context = new FishFactoryDatabase();
-			return context.Orders
+            return context.Orders
                 .Include(x => x.Canned)
                 .Include(x => x.Client)
                 .Include(x => x.Implementer)

FishFactoryDatabaseImplement/Migrations/20240513132159_initialcreate.Designer.cs

@@ -1,255 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240513132159_initialcreate")]
-    partial class initialcreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int?>("ImplementerId")
-                        .IsRequired()
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240513152048_add_implementer.Designer.cs

@@ -1,255 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240513152048_add_implementer")]
-    partial class add_implementer
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int?>("ImplementerId")
-                        .IsRequired()
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240513152048_add_implementer.cs

@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class add_implementer : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240513170412_create.Designer.cs

@@ -1,252 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240513170412_create")]
-    partial class create
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId");
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240513170412_create.cs

@@ -1,59 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class create : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Orders_Implementers_ImplementerId",
-                table: "Orders");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ImplementerId",
-                table: "Orders",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            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_Implementers_ImplementerId",
-                table: "Orders");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ImplementerId",
-                table: "Orders",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Orders_Implementers_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId",
-                principalTable: "Implementers",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240514161521_implementer2.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class implementer2 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "MessageInfos",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "text", nullable: false),
-                    ClientId = table.Column<int>(type: "integer", nullable: true),
-                    SenderName = table.Column<string>(type: "text", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    Subject = table.Column<string>(type: "text", nullable: false),
-                    Body = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_MessageInfos_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ClientId",
-                table: "MessageInfos",
-                column: "ClientId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240621171359_create.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace FishFactoryDatabaseImplement.Migrations
 {
     [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240514161521_implementer2")]
+    [Migration("20240621171359_create")]
-    partial class implementer2
+    partial class create
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -238,7 +238,7 @@ namespace FishFactoryDatabaseImplement.Migrations
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.MessageInfo", b =>
                 {
                     b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
+                        .WithMany("ClientMessages")
                         .HasForeignKey("ClientId");
 
                     b.Navigation("Client");
@@ -276,6 +276,11 @@ namespace FishFactoryDatabaseImplement.Migrations
                     b.Navigation("Orders");
                 });
 
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("ClientMessages");
+                });
+
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
                 {
                     b.Navigation("CannedComponents");

FishFactoryDatabaseImplement/Migrations/20240621171359_create.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace FishFactoryDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class initialcreate : Migration
+    public partial class create : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -71,6 +71,27 @@ namespace FishFactoryDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Implementers", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "MessageInfos",
+                columns: table => new
+                {
+                    MessageId = table.Column<string>(type: "text", nullable: false),
+                    ClientId = table.Column<int>(type: "integer", nullable: true),
+                    SenderName = table.Column<string>(type: "text", nullable: false),
+                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    Subject = table.Column<string>(type: "text", nullable: false),
+                    Body = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
+                    table.ForeignKey(
+                        name: "FK_MessageInfos_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id");
+                });
+
             migrationBuilder.CreateTable(
                 name: "CannedComponents",
                 columns: table => new
@@ -106,7 +127,7 @@ namespace FishFactoryDatabaseImplement.Migrations
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     CannedId = table.Column<int>(type: "integer", nullable: false),
                     ClientId = table.Column<int>(type: "integer", nullable: false),
-                    ImplementerId = table.Column<int>(type: "integer", nullable: false),
+                    ImplementerId = table.Column<int>(type: "integer", nullable: true),
                     Count = table.Column<int>(type: "integer", nullable: false),
                     Sum = table.Column<double>(type: "double precision", nullable: false),
                     Status = table.Column<int>(type: "integer", nullable: false),
@@ -132,8 +153,7 @@ namespace FishFactoryDatabaseImplement.Migrations
                         name: "FK_Orders_Implementers_ImplementerId",
                         column: x => x.ImplementerId,
                         principalTable: "Implementers",
-                        principalColumn: "Id",
+                        principalColumn: "Id");
-                        onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateIndex(
@@ -146,6 +166,11 @@ namespace FishFactoryDatabaseImplement.Migrations
                 table: "CannedComponents",
                 column: "ComponentId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_MessageInfos_ClientId",
+                table: "MessageInfos",
+                column: "ClientId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_CannedId",
                 table: "Orders",
@@ -168,6 +193,9 @@ namespace FishFactoryDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "CannedComponents");
 
+            migrationBuilder.DropTable(
+                name: "MessageInfos");
+
             migrationBuilder.DropTable(
                 name: "Orders");
 

FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs

@@ -235,7 +235,7 @@ namespace FishFactoryDatabaseImplement.Migrations
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.MessageInfo", b =>
                 {
                     b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
+                        .WithMany("ClientMessages")
                         .HasForeignKey("ClientId");
 
                     b.Navigation("Client");
@@ -273,6 +273,11 @@ namespace FishFactoryDatabaseImplement.Migrations
                     b.Navigation("Orders");
                 });
 
+            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("ClientMessages");
+                });
+
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
                 {
                     b.Navigation("CannedComponents");

FishFactoryDatabaseImplement/Models/Implementer.cs

@@ -1,6 +1,7 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.ViewModels;
 using FishFactoryDataModel.Models;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
 

FishFactoryDatabaseImplement/Models/Order.cs

@@ -51,6 +51,7 @@ namespace FishFactoryDatabaseImplement.Models
                 Client = context.Clients.First(x => x.Id == model.ClientId),
                 ImplementerId = model.ImplementerId,
 				Implementer = model.ImplementerId == null ? null : context.Implementers.First(i => i.Id == model.ImplementerId),
+
 				Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -66,14 +67,8 @@ namespace FishFactoryDatabaseImplement.Models
             }
             using var context = new FishFactoryDatabase();
 
-            Id = model.Id;
-            CannedId = model.CannedId;
-            ClientId = model.ClientId;
             ImplementerId = model.ImplementerId;
-            Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
         }
         public OrderViewModel GetViewModel => new()