LawFirm/LawFirm/FormCreateOrder.cs

@@ -103,6 +103,7 @@ namespace LawFirmView
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
                     DocumentId = Convert.ToInt32(comboBoxDocument.SelectedValue),
+                    DocumentName = comboBoxDocument.Text,
                     Count = Convert.ToInt32(textBoxCount.Text),
                     Sum = Convert.ToDouble(textBoxSum.Text)
                 });

LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -59,6 +59,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
             {
                 Id = viewModel.Id,
                 DocumentId = viewModel.DocumentId,
+                DocumentName = viewModel.DocumentName,
                 Status = viewModel.Status,
                 DateCreate = viewModel.DateCreate,
                 DateImplement = viewModel.DateImplement,
@@ -66,7 +67,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
                 Sum = viewModel.Sum
             };
 
-            CheckModel(model, false);
+            CheckModel(model);
             if (model.Status + 1 != newStatus)
             {
                 _logger.LogWarning("Status update to " + newStatus.ToString() +" operation failed. Order status incorrect.");

LawFirm/LawFirmContracts/BindingModels/OrderBindingModel.cs

@@ -12,6 +12,8 @@ namespace LawFirmContracts.BindingModels
     {
         public int DocumentId { get; set; }
 
+        public string DocumentName { get; set; } = string.Empty;
+
         public int Count { get; set; }
 
         public double Sum { get; set; }

LawFirm/LawFirmDataModels/Models/IOrderModel.cs

@@ -10,6 +10,7 @@ namespace LawFirmDataModels.Models
     public interface IOrderModel : IId
     {
         int DocumentId { get; }
+        string DocumentName { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs

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

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

@@ -1,171 +0,0 @@
-// <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

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

LawFirm/LawFirmDatabaseImplement/Models/Document.cs

@@ -39,7 +39,6 @@ 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,6 +16,8 @@ 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]
@@ -26,7 +28,6 @@ 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)
         {
@@ -37,6 +38,7 @@ namespace LawFirmDatabaseImplement.Models
             return new Order
             {
                 DocumentId = model.DocumentId,
+                DocumentName = model.DocumentName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -52,20 +54,26 @@ 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
         };
     }
 }

LawFirm/LawFirmFileImplement/Implements/BlankStorage.cs

@@ -79,7 +79,7 @@ namespace LawFirmFileImplement.Implements
             {
                 return null;
             }
-            source.Blanks.Remove(blank);
+            blank.Update(model);
             source.SaveBlanks();
             return blank.GetViewModel;
         }

LawFirm/LawFirmFileImplement/Implements/DocumentStorage.cs

@@ -78,7 +78,7 @@ namespace LawFirmFileImplement.Implements
             {
                 return null;
             }
-            source.Documents.Remove(document);
+            document.Update(model);
             source.SaveDocuments();
             return document.GetViewModel;
         }

LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs

@@ -26,8 +26,8 @@ namespace LawFirmFileImplement.Implements
             {
                 return null;
             }
-            return GetViewModel(source.Orders
+            return source.Orders
-            .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
+            .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -38,13 +38,13 @@ namespace LawFirmFileImplement.Implements
             }
             return source.Orders
                 .Where(x => x.Id == model.Id)
-                .Select(x => GetViewModel(x))
+                .Select(x => x.GetViewModel)
                 .ToList();
         }
 
         public List<OrderViewModel> GetFullList()
         {
-            return source.Orders.Select(x => GetViewModel(x)).ToList();
+            return source.Orders.Select(x => x.GetViewModel).ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -57,7 +57,7 @@ namespace LawFirmFileImplement.Implements
             }
             source.Orders.Add(newOrder);
             source.SaveOrders();
-            return GetViewModel(newOrder);
+            return newOrder.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -69,7 +69,7 @@ namespace LawFirmFileImplement.Implements
             }
             order.Update(model);
             source.SaveOrders();
-            return GetViewModel(order);
+            return order.GetViewModel;
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {
@@ -78,23 +78,9 @@ namespace LawFirmFileImplement.Implements
             {
                 return null;
             }
-            source.Orders.Remove(order);
+            order.Update(model);
             source.SaveOrders();
-            return GetViewModel(order);
+            return order.GetViewModel;
-        }
-
-        private OrderViewModel GetViewModel(Order order)
-        {
-            var viewModel = order.GetViewModel;
-            foreach (var document in source.Documents)
-            {
-                if (document.Id == order.DocumentId)
-                {
-                    viewModel.DocumentName = document.DocumentName;
-                    break;
-                }
-            }
-            return viewModel;
         }
 
     }

LawFirm/LawFirmFileImplement/Models/Order.cs

@@ -15,6 +15,8 @@ namespace LawFirmFileImplement.Models
     {
         public int DocumentId { get; private set; }
 
+        public string DocumentName { get; private set; } = string.Empty;
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -36,6 +38,7 @@ namespace LawFirmFileImplement.Models
             return new Order
             {
                 DocumentId = model.DocumentId,
+                DocumentName = model.DocumentName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -54,6 +57,7 @@ namespace LawFirmFileImplement.Models
             return new Order()
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                DocumentName = element.Element("DocumentName")!.Value,
                 DocumentId = Convert.ToInt32(element.Element("DocumentId")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
@@ -69,13 +73,20 @@ namespace LawFirmFileImplement.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,
@@ -87,6 +98,7 @@ namespace LawFirmFileImplement.Models
         public XElement GetXElement => new(
             "Order",
              new XAttribute("Id", Id),
+             new XElement("DocumentName", DocumentName),
              new XElement("DocumentId", DocumentId.ToString()),
              new XElement("Count", Count.ToString()),
              new XElement("Sum", Sum.ToString()),

LawFirm/LawFirmListImplements/Implements/OrderStorage.cs

@@ -30,7 +30,7 @@ namespace LawFirmListImplements.Implements
             {
                 if (model.Id.HasValue && order.Id == model.Id)
                 {
-                    return GetViewModel(order);
+                    return order.GetViewModel;
                 }
             }
             return null;
@@ -47,7 +47,7 @@ namespace LawFirmListImplements.Implements
             {
                 if (order.Id == model.Id)
                 {
-                    result.Add(GetViewModel(order));
+                    result.Add(order.GetViewModel);
                 }
             }
             return result;
@@ -58,7 +58,7 @@ namespace LawFirmListImplements.Implements
             var result = new List<OrderViewModel>();
             foreach (var order in _source.Orders)
             {
-                result.Add(GetViewModel(order));
+                result.Add(order.GetViewModel);
             }
             return result;
         }
@@ -79,7 +79,7 @@ namespace LawFirmListImplements.Implements
                 return null;
             }
             _source.Orders.Add(newOrder);
-            return GetViewModel(newOrder);
+            return newOrder.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -89,7 +89,7 @@ namespace LawFirmListImplements.Implements
                 if (order.Id == model.Id)
                 {
                     order.Update(model);
-                    return GetViewModel(order);
+                    return order.GetViewModel;
                 }
             }
             return null;
@@ -102,25 +102,11 @@ namespace LawFirmListImplements.Implements
                 {
                     var element = _source.Orders[i];
                     _source.Orders.RemoveAt(i);
-                    return GetViewModel(element);
+                    return element.GetViewModel;
                 }
             }
             return null;
         }
 
-        private OrderViewModel GetViewModel(Order order)
-        {
-            var viewModel = order.GetViewModel;
-            foreach (var document in _source.Documents)
-            {
-                if (document.Id == order.DocumentId)
-                {
-                    viewModel.DocumentName = document.DocumentName;
-                    break;
-                }
-            }
-            return viewModel;
-        }
-
     }
 }

LawFirm/LawFirmListImplements/Models/Order.cs

@@ -14,6 +14,8 @@ namespace LawFirmListImplements.Models
     {
         public int DocumentId { get; private set; }
 
+        public string DocumentName { get; private set; } = string.Empty;
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -35,6 +37,7 @@ namespace LawFirmListImplements.Models
             return new Order
             {
                 DocumentId = model.DocumentId,
+                DocumentName = model.DocumentName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -50,13 +53,20 @@ namespace LawFirmListImplements.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,