ready

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

@@ -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,6 +118,7 @@ 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)
             {

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,6 +77,7 @@ 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? Password { get; set; }
+		public string? ImplementerFIO { get; set; } = string.Empty;
+		public string? Password { get; set; } = string.Empty;
 	}
 }

FishFactoryContracts/ViewModels/ImplementerViewModel.cs

@@ -1,9 +1,9 @@
-
+using FishFactoryDataModel.Models;
 using System.ComponentModel;
 
 namespace FishFactoryContracts.ViewModels
 {
-    public class ImplementerViewModel
+    public class ImplementerViewModel : IImplementerModel
     {
         public int Id { get; set; }
         [DisplayName("ФИО исполнителя")]

FishFactoryDatabaseImplement/Migrations/20240514140738_implementer.Designer.cs

@@ -0,0 +1,252 @@
+// <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("20240514140738_implementer")]
+    partial class 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")
+                        .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/20240514140738_implementer.cs

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

FishFactoryDatabaseImplement/Migrations/20240514143630_implementer2.Designer.cs

@@ -0,0 +1,252 @@
+// <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("20240514143630_implementer2")]
+    partial class implementer2
+    {
+        /// <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/20240514143630_implementer2.cs

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

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;
 
 namespace FishFactoryDatabaseImplement.Models
@@ -8,13 +9,13 @@ namespace FishFactoryDatabaseImplement.Models
     public class Implementer : IImplementerModel
     {
         public int Id { get; private set; }
-
+        [Required]
 		public string ImplementerFIO { get; private set; } = string.Empty;
-
+		[Required]
 		public string Password { get; private set; } = string.Empty;
-
+		[Required]
 		public int WorkExperience { get; private set; } = 0;
-
+		[Required]
 		public int Qualification { get; private set; } = 0;
 		[ForeignKey("ImplementerId")]
         public virtual List<Order> Order { get; set; } = new();

FishFactoryDatabaseImplement/Models/Order.cs

@@ -40,6 +40,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,
@@ -55,14 +56,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()