lab 6 hard complete

2023-05-03 19:17:42 +04:00 · 2023-05-03 19:17:42 +04:00 · a67e43a4c5
commit a67e43a4c5
parent 13b2f43aaf
9 changed files with 407 additions and 53 deletions
--- a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs
+++ b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs
@ -74,7 +74,7 @@
            this.ИзделияToolStripMenuItem,
            this.КомпонентыToolStripMenuItem,
            this.клиентыToolStripMenuItem,
-            this.исполнителиToolStripMenuItem});
+            this.исполнителиToolStripMenuItem,
            this.StoreToolStripMenuItem,
            this.клиентыToolStripMenuItem});
            this.СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem";
--- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs
+++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs
@ -47,8 +47,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic
            {
                throw new ArgumentNullException(nameof(model));
            }
-            _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}",
-                model.ImplementerFIO, model.Id);
+            _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}", model.ImplementerFIO, model.Id);
            var element = _implementerStorage.GetElement(model);
            if (element == null)
            {
--- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs
+++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs
@ -47,51 +47,46 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic

        public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
        {
-            var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
-
-            if (viewModel == null)
+            var vmodel = _orderStorage.GetElement(new() { Id = model.Id });
+            if (vmodel == null)
            {
                throw new ArgumentNullException(nameof(model));
            }
-
-            if (viewModel.Status + 1 != newStatus)
+            if ((int)vmodel.Status + 1 != (int)newStatus && !(vmodel.Status == OrderStatus.Ожидается && newStatus == OrderStatus.Готов))
            {
-                _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect.");
-                return false;
+                throw new InvalidOperationException($"Попытка перевести заказ не в следующий статус: " +
+                    $"Текущий статус: {vmodel.Status} \n" +
+                    $"Планируемый статус: {newStatus} \n" +
+                    $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}");
            }
+            if (newStatus == OrderStatus.Готов || newStatus == OrderStatus.Ожидается)
+            {
+                var vpackage = _packageStorage.GetElement(new() { Id = vmodel.PackageId });

+                if (vpackage == null || !_storeLogic.AddPackage(vpackage, vmodel.Count))
+                {
+                    _logger.LogWarning($"Не удалось заполнить магазины изделием '{vpackage?.PackageName ?? string.Empty}' из заказа {vmodel.Id}");
+                    newStatus = OrderStatus.Ожидается;
+                }
+                else
+                {
+                    newStatus = OrderStatus.Готов;
+                }
+            }
            model.Status = newStatus;
-
-            if (model.Status == OrderStatus.Готов)
-            {
-                model.DateImplement = DateTime.Now;
-
-                var package = _packageStorage.GetElement(new() { Id = viewModel.PackageId });
-
-                if (package == null)
-                {
-                    throw new ArgumentNullException(nameof(package));
-                }
-
-                if (!_storeLogic.AddPackage(package, viewModel.Count))
-                {
-                    throw new Exception($"AddPackage operation failed. Store is full.");
-                }
-            }
-            else
-            {
-                model.DateImplement = viewModel.DateImplement;
-            }
-
-            CheckModel(model, false);
-
+            model.DateCreate = vmodel.DateCreate;
+            if (model.DateImplement == null)
+                model.DateImplement = vmodel.DateImplement;
+            if (vmodel.ImplementerId.HasValue)
+                model.ImplementerId = vmodel.ImplementerId;
+            model.PackageId = vmodel.PackageId;
+            model.Sum = vmodel.Sum;
+            model.Count = vmodel.Count;
            if (_orderStorage.Update(model) == null)
            {
-                model.Status--;
                _logger.LogWarning("Update operation failed");
                return false;
            }
-
            return true;
        }

@ -107,6 +102,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic

        public bool FinishOrder(OrderBindingModel model)
        {
+            model.DateImplement = DateTime.Now;
            return StatusUpdate(model, OrderStatus.Выдан);
        }

--- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs
+++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs
@ -31,7 +31,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic
                return;
            }

-            var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется } });
+            var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется, OrderStatus.Ожидается } });
            if (orders == null || orders.Count == 0)
            {
                _logger.LogWarning("DoWork. Orders is null or empty");
@ -54,33 +54,54 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic

            await Task.Run(() =>
            {
-                foreach (var order in orders)
+                foreach (var order in orders.Where(x => x.Status == OrderStatus.Ожидается && x.ImplementerId == implementer.Id))
+                {
+                    try
+                    {
+                        _orderLogic.DeliveryOrder(new OrderBindingModel
+                        {
+                            Id = order.Id
+                        });
+                    }
+                    catch (InvalidOperationException ex)
+                    {
+                        _logger.LogWarning(ex, "Error try get work");
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Error while do work");
+                        throw;
+                    }
+                    Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+                }
+            });
+
+            await RunOrderInWork(implementer, orders);
+
+            await Task.Run(() =>
+            {
+                foreach (var order in orders.Where(x => x.Status == OrderStatus.Принят))
                {
                    try
                    {
                        _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
-                        
                        _orderLogic.TakeOrderInWork(new OrderBindingModel
                        {
                            Id = order.Id,
                            ImplementerId = implementer.Id
                        });
-                        
                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
                        _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
                        _orderLogic.DeliveryOrder(new OrderBindingModel
                        {
                            Id = order.Id
                        });
-                        
                        Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
                    }
-                    
                    catch (InvalidOperationException ex)
                    {
                        _logger.LogWarning(ex, "Error try get work");
                    }
-                    
                    catch (Exception ex)
                    {
                        _logger.LogError(ex, "Error while do work");
@ -97,8 +118,7 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic
                return;
            }
            try
-            {
-                
+            {           
                var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
                if (runOrder == null)
                {
--- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Migrations/20230503134657_InitDb.Designer.cs
+++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Migrations/20230503134657_InitDb.Designer.cs
@ -0,0 +1,340 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SoftwareInstallationDataBaseImplement;
+
+#nullable disable
+
+namespace SoftwareInstallationDataBaseImplement.Migrations
+{
+    [DbContext(typeof(SoftwareInstallationDataBase))]
+    [Migration("20230503134657_InitDb")]
+    partial class InitDb
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.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("SoftwareInstallationDataBaseImplement.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("SoftwareInstallationDataBaseImplement.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("SoftwareInstallationDataBaseImplement.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>("PackageId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("PackageName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
+                    b.HasIndex("PackageId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Package", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("PackageName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Packages");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.PackageComponent", 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>("PackageId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("PackageId");
+
+                    b.ToTable("PackageComponents");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Store", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("OpeningDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("PackageMaxCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StoreAdress")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Stores");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.StorePackage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PackageId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StoreId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackageId");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("StorePackages");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Package", "Package")
+                        .WithMany("Orders")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
+                    b.Navigation("Package");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.PackageComponent", b =>
+                {
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Component", "Component")
+                        .WithMany("PackageComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Package", "Package")
+                        .WithMany("Components")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Package");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.StorePackage", b =>
+                {
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Package", "Package")
+                        .WithMany("StorePackages")
+                        .HasForeignKey("PackageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SoftwareInstallationDataBaseImplement.Models.Store", "Store")
+                        .WithMany("Packages")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Package");
+
+                    b.Navigation("Store");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("PackageComponents");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Package", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+
+                    b.Navigation("StorePackages");
+                });
+
+            modelBuilder.Entity("SoftwareInstallationDataBaseImplement.Models.Store", b =>
+                {
+                    b.Navigation("Packages");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Migrations/20230428121847_InitDatabase.cs
+++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Migrations/20230428121847_InitDatabase.cs
@ -6,11 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace SoftwareInstallationDataBaseImplement.Migrations
 {
    /// <inheritdoc />
-<<<<<<<< HEAD:SoftwareInstallation/SoftwareInstallationDataBaseImplement/Migrations/20230428121847_InitDatabase.cs
-    public partial class InitDatabase : Migration
-========
-    public partial class CreateBD : Migration
->>>>>>>> LabRab_6:SoftwareInstallation/SoftwareInstallationDataBaseImplement/Migrations/20230410192808_CreateBD.cs
+    public partial class InitDb : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
--- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Store.cs
+++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Store.cs
@ -29,8 +29,10 @@ namespace SoftwareInstallationDataBaseImplement.Models
            {
                if (_storePackages == null)
                {
+                    using var context = new SoftwareInstallationDataBase();
                    _storePackages = Packages
-                            .ToDictionary(recPC => recPC.PackageId, recPC => (recPC.Package as IPackageModel, recPC.Count));
+                        .ToDictionary(x => x.PackageId, x => (context.Packages
+                        .FirstOrDefault(y => y.Id == x.PackageId)! as IPackageModel, x.Count));
                }
                return _storePackages;
            }
--- a/SoftwareInstallation/SoftwareInstallationDataModels/Enums/OrderStatus.cs
+++ b/SoftwareInstallation/SoftwareInstallationDataModels/Enums/OrderStatus.cs
@ -6,6 +6,7 @@
        Принят = 0,
        Выполняется = 1,
        Готов = 2,
-        Выдан = 3
+        Выдан = 3,
+        Ожидается = 4
    }
 }
--- a/SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ImplementerController.cs
+++ b/SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ImplementerController.cs
@ -93,7 +93,7 @@ namespace SoftwareInstallationRestApi.Controllers
        {
            try
            {
-                _order.FinishOrder(model);
+                _order.DeliveryOrder(model);
            }
            catch (Exception ex)
            {