BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -82,12 +82,12 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
                 _logger.LogWarning("Read operation failed");
                 return false;
             }
-            if (element.Status != status - 1)
+            if (!(element.Status == status - 1 || model.Status == OrderStatus.Готов))
             {
                 _logger.LogWarning("Status change operation failed");
                 throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный");
             }
-            if (element.Status == OrderStatus.Готов)
+            if (element.Status == OrderStatus.Готов || element.Status == OrderStatus.Ожидает)
             {
                 var manufacture = _manufactureStorage.GetElement(new ManufactureSearchModel() { Id = model.ManufactureId });
                 if (manufacture == null)
@@ -98,7 +98,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
                 if (CheckSupply(manufacture, model.Count) == false)
                 {
                     _logger.LogWarning("Status update to " + status.ToString() + " operation failed. Shop supply error.");
-                    return false;
+                    status = OrderStatus.Ожидает;
                 }
             }
             model.Status = status;

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -31,19 +31,21 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
                 _logger.LogWarning("DoWork. Implementers is null");
                 return;
             }
-            var orders = _orderLogic.ReadList(new OrderSearchModel
+            var deliveredOrders = _orderLogic.ReadList(new OrderSearchModel
             {
-                Status = OrderStatus.Принят
+                Status = OrderStatus.Выдан
             });
-            if (orders == null || orders.Count == 0)
+            var allOrders = _orderLogic.ReadList(null);
+            if (deliveredOrders == null ||  allOrders == null || deliveredOrders.Count == allOrders.Count)
             {
                 _logger.LogWarning("DoWork. Orders is null or empty");
                 return;
             }
-            _logger.LogDebug("DoWork for {Count} orders", orders.Count);
+            deliveredOrders.ForEach(x => allOrders.Remove(x));
+            _logger.LogDebug("DoWork for {Count} orders", allOrders.Count);
             foreach (var implementer in implementers)
             {
-                Task.Run(() => WorkerWorkAsync(implementer, orders));
+                Task.Run(() => WorkerWorkAsync(implementer, allOrders));
             }
         }
         /// Иммитация работы исполнителя
@@ -53,6 +55,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
             {
                 return;
             }
+            await DeliverWaitingOrder(implementer);
             await RunOrderInWork(implementer);
             await Task.Run(() =>
             {
@@ -74,6 +77,10 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
                         {
                             Id = order.Id
                         });
+                        _orderLogic.DeliveryOrder(new OrderBindingModel 
+                        { 
+                            Id = order.Id 
+                        });
                         // отдыхаем
                         Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
                     }
@@ -117,6 +124,10 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
                 {
                     Id = runOrder.Id
                 });
+                _orderLogic.DeliveryOrder(new OrderBindingModel
+                {
+                    Id = runOrder.Id
+                });
                 // отдыхаем
                 Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
             }
@@ -132,5 +143,47 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
                 throw;
             }
         }
+        /// Обрабатываем заказ, которые в ожидании (вдруг место освободилось)
+        private async Task DeliverWaitingOrder(ImplementerViewModel implementer)
+        {
+            if (_orderLogic == null || implementer == null)
+            {
+                return;
+            }
+            var waitingOrders = await Task.Run(() => _orderLogic.ReadList(new OrderSearchModel
+            {
+                ImplementerId = implementer.Id,
+                Status = OrderStatus.Ожидает
+            }));
+            if (waitingOrders == null || waitingOrders.Count == 0)
+            {
+                return;
+            }
+            _logger.LogInformation("DeliverWaitingOrder. Find some waitig order for implementer:{id}.Count:{count}", implementer.Id, waitingOrders.Count);
+            foreach (var waitingOrder in waitingOrders)
+            {
+                try
+                {
+                    _logger.LogInformation("DeliverWaitingOrder. Trying to deliver order id:{id}", waitingOrder.Id);
+                    var res = _orderLogic.DeliveryOrder(new OrderBindingModel
+                    {
+                        Id = waitingOrder.Id
+                    });
+                }
+                catch (ArgumentException ex)
+                {
+                    _logger.LogWarning(ex, "DeliverWaitingOrder. Fault");
+                }
+                catch (InvalidOperationException ex)
+                {
+                    _logger.LogWarning(ex, "Error try deliver order");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error while do work");
+                    throw;
+                }
+            }
+        }
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopDataModels/Enums/OrderStatus.cs

@@ -10,6 +10,8 @@
 
         Готов = 2,
 
-        Выдан = 3
+        Ожидает = 3,
+
+        Выдан = 4
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240422165434_addingImplementors.Designer.cs

@@ -1,257 +0,0 @@
-// <auto-generated />
-using System;
-using BlacksmithWorkshopDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace BlacksmithWorkshopDatabaseImplement.Migrations
-{
-    [DbContext(typeof(BlacksmithWorkshopDataBase))]
-    [Migration("20240422165434_addingImplementors")]
-    partial class addingImplementors
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("BlacksmithWorkshopDataModels.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("BlacksmithWorkshopDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ManufactureName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Manufactures");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ManufactureComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ManufactureId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("ManufactureId");
-
-                    b.ToTable("ManufactureComponents");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ManufactureId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.HasIndex("ManufactureId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.ManufactureComponent", b =>
-                {
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Component", "Component")
-                        .WithMany("ManufactureComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
-                        .WithMany("Components")
-                        .HasForeignKey("ManufactureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Manufacture");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BlacksmithWorkshopDataModels.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
-                        .WithMany("Orders")
-                        .HasForeignKey("ManufactureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-
-                    b.Navigation("Manufacture");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDataModels.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("ManufactureComponents");
-                });
-
-            modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240422165434_addingImplementors.cs

@@ -1,67 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BlacksmithWorkshopDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class addingImplementors : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "ImplementerId",
-                table: "Orders",
-                type: "int",
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "Implementers",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ImplementerFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Qualification = table.Column<int>(type: "int", nullable: false),
-                    WorkExperience = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Implementers", x => x.Id);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId");
-
-            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.DropTable(
-                name: "Implementers");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Orders_ImplementerId",
-                table: "Orders");
-
-            migrationBuilder.DropColumn(
-                name: "ImplementerId",
-                table: "Orders");
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240507165329_InitialCreate.Designer.cs

@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace BlacksmithWorkshopDatabaseImplement.Migrations
 {
     [DbContext(typeof(BlacksmithWorkshopDataBase))]
-    [Migration("20240421170619_initialCreate")]
-    partial class initialCreate
+    [Migration("20240507165329_InitialCreate")]
+    partial class InitialCreate
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,6 +25,33 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
+            modelBuilder.Entity("BlacksmithWorkshopDataModels.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("BlacksmithWorkshopDatabaseImplement.Models.Client", b =>
                 {
                     b.Property<int>("Id")
@@ -136,6 +163,9 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("ManufactureId")
                         .HasColumnType("int");
 
@@ -149,6 +179,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("ManufactureId");
 
                     b.ToTable("Orders");
@@ -234,6 +266,10 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("BlacksmithWorkshopDataModels.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
                     b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Manufacture", "Manufacture")
                         .WithMany("Orders")
                         .HasForeignKey("ManufactureId")
@@ -242,6 +278,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
+                    b.Navigation("Implementer");
+
                     b.Navigation("Manufacture");
                 });
 
@@ -264,6 +302,11 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                     b.Navigation("Shop");
                 });
 
+            modelBuilder.Entity("BlacksmithWorkshopDataModels.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
             modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Client", b =>
                 {
                     b.Navigation("Orders");

BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Migrations/20240507165329_InitialCreate.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace BlacksmithWorkshopDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class initialCreate : Migration
+    public partial class InitialCreate : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -40,6 +40,22 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Components", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Implementers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ImplementerFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Qualification = table.Column<int>(type: "int", nullable: false),
+                    WorkExperience = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Manufactures",
                 columns: table => new
@@ -109,7 +125,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                     Status = table.Column<int>(type: "int", nullable: false),
                     DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
                     DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    ManufactureId = table.Column<int>(type: "int", nullable: false)
+                    ManufactureId = table.Column<int>(type: "int", nullable: false),
+                    ImplementerId = table.Column<int>(type: "int", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -120,6 +137,11 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                         principalTable: "Clients",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Orders_Implementers_ImplementerId",
+                        column: x => x.ImplementerId,
+                        principalTable: "Implementers",
+                        principalColumn: "Id");
                     table.ForeignKey(
                         name: "FK_Orders_Manufactures_ManufactureId",
                         column: x => x.ManufactureId,
@@ -170,6 +192,11 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
                 table: "Orders",
                 column: "ClientId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_ManufactureId",
                 table: "Orders",
@@ -204,6 +231,9 @@ namespace BlacksmithWorkshopDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "Clients");
 
+            migrationBuilder.DropTable(
+                name: "Implementers");
+
             migrationBuilder.DropTable(
                 name: "Manufactures");