Исправления

LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs

@@ -3,6 +3,7 @@ using LawFirmContracts.SearchModels;
 using LawFirmContracts.StorageContracts;
 using LawFirmContracts.ViewModels;
 using LawFirmDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,7 +21,7 @@ namespace LawFirmDatabaseImplement.Implements
                 return null;
             }
             using var context = new LawFirmDatabase();
-            return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+            return context.Orders.Include(x => x.Document).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -32,6 +33,7 @@ namespace LawFirmDatabaseImplement.Implements
             using var context = new LawFirmDatabase();
             return context.Orders
             .Where(x => x.Id == model.Id)
+            .Include(x => x.Document)
             .Select(x => x.GetViewModel)
             .ToList();
         }
@@ -39,7 +41,7 @@ namespace LawFirmDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new LawFirmDatabase();
-            return context.Orders.Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Document).Select(x => x.GetViewModel).ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -52,7 +54,7 @@ namespace LawFirmDatabaseImplement.Implements
             using var context = new LawFirmDatabase();
             context.Orders.Add(newOrder);
             context.SaveChanges();
-            return newOrder.GetViewModel;
+            return context.Orders.Include(x => x.Document).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -65,7 +67,7 @@ namespace LawFirmDatabaseImplement.Implements
             }
             order.Update(model);
             context.SaveChanges();
-            return order.GetViewModel;
+            return context.Orders.Include(x => x.Document).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {

LawFirm/LawFirmDatabaseImplement/Migrations/20230310164628_OrderFix.Designer.cs

@@ -0,0 +1,171 @@
+// <auto-generated />
+using System;
+using LawFirmDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace LawFirmDatabaseImplement.Migrations
+{
+    [DbContext(typeof(LawFirmDatabase))]
+    [Migration("20230310164628_OrderFix")]
+    partial class OrderFix
+    {
+        /// <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("LawFirmDatabaseImplement.Models.Blank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("BlankName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Blanks");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("DocumentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BlankId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BlankId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.ToTable("DocumentBlanks");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b =>
+                {
+                    b.HasOne("LawFirmDatabaseImplement.Models.Blank", "Blank")
+                        .WithMany("DocumentBlanks")
+                        .HasForeignKey("BlankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document")
+                        .WithMany("Blanks")
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Blank");
+
+                    b.Navigation("Document");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document")
+                        .WithMany("Orders")
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b =>
+                {
+                    b.Navigation("DocumentBlanks");
+                });
+
+            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b =>
+                {
+                    b.Navigation("Blanks");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

LawFirm/LawFirmDatabaseImplement/Migrations/20230310164628_OrderFix.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LawFirmDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class OrderFix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DocumentName",
+                table: "Orders");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DocumentName",
+                table: "Orders",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+        }
+    }
+}

LawFirm/LawFirmDatabaseImplement/Migrations/LawFirmDatabaseModelSnapshot.cs

@@ -108,10 +108,6 @@ namespace LawFirmDatabaseImplement.Migrations
                     b.Property<int>("DocumentId")
                         .HasColumnType("int");
 
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -146,11 +142,13 @@ namespace LawFirmDatabaseImplement.Migrations
 
             modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("LawFirmDatabaseImplement.Models.Document", null)
+                    b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document")
                         .WithMany("Orders")
                         .HasForeignKey("DocumentId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.Navigation("Document");
                 });
 
             modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b =>

LawFirm/LawFirmDatabaseImplement/Models/Document.cs

@@ -39,6 +39,7 @@ namespace LawFirmDatabaseImplement.Models
         [ForeignKey("DocumentId")]
         public virtual List<Order> Orders { get; set; } = new();
 
+
         public static Document? Create(LawFirmDatabase context, DocumentBindingModel model)
         {
             return new Document()

LawFirm/LawFirmDatabaseImplement/Models/Order.cs

@@ -16,8 +16,6 @@ namespace LawFirmDatabaseImplement.Models
         public int Id { get; private set; }
         [Required]
         public int DocumentId { get; private set; }
-
-        public string DocumentName { get; private set; } = string.Empty;
         [Required]
         public int Count { get; private set; }
         [Required]
@@ -28,6 +26,7 @@ namespace LawFirmDatabaseImplement.Models
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
         public DateTime? DateImplement { get; private set; }
+        public virtual Document Document { get; set; }
 
         public static Order? Create(OrderBindingModel? model)
         {
@@ -38,7 +37,6 @@ namespace LawFirmDatabaseImplement.Models
             return new Order
             {
                 DocumentId = model.DocumentId,
-                DocumentName = model.DocumentName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -54,26 +52,20 @@ namespace LawFirmDatabaseImplement.Models
             {
                 return;
             }
-            DocumentId = model.DocumentId;
-            DocumentName = model.DocumentName;
-            Count = model.Count;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
-            Id = model.Id;
         }
 
         public OrderViewModel GetViewModel => new()
         {
             DocumentId = DocumentId,
-            DocumentName = DocumentName,
             Count = Count,
             Sum = Sum,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
             Id = Id,
             Status = Status,
+            DocumentName = Document.DocumentName
         };
     }
 }