LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs

@@ -43,7 +43,6 @@ namespace LawFirmDatabaseImplement.Implements
                 return context.Orders
                     .Include(x => x.Client)
                     .Include(x => x.Implementer)
-					.Include(x => x.Document)
                     .Where(x => x.ClientId == model.ClientId)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -51,7 +50,6 @@ namespace LawFirmDatabaseImplement.Implements
             if (model.Status!= null)
             {
                 return context.Orders
-					.Include(x => x.Document)
                     .Include(x => x.Client)
                     .Include(x => x.Implementer)
                     .Where(x => model.Status.Equals(x.Status))
@@ -60,7 +58,6 @@ namespace LawFirmDatabaseImplement.Implements
             }
             return context.Orders
                 .Include(x => x.Document)
-				.Include(x => x.Client)
                 .Include(x => x.Implementer)
                 .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
                 .Select(x => x.GetViewModel)
@@ -70,7 +67,7 @@ namespace LawFirmDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new LawFirmDatabase();
-            return context.Orders.Include(x => x.Document).Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Document).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -83,7 +80,7 @@ namespace LawFirmDatabaseImplement.Implements
             using var context = new LawFirmDatabase();
             context.Orders.Add(newOrder);
             context.SaveChanges();
-            return context.Orders.Include(x => x.Document).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
+            return context.Orders.Include(x => x.Document).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -96,13 +93,12 @@ namespace LawFirmDatabaseImplement.Implements
             }
             order.Update(model);
             context.SaveChanges();
-            return context.Orders.Include(x => x.Document).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+            return context.Orders.Include(x => x.Document).Include(x => x.Implementer).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new LawFirmDatabase();
             var element = context.Orders
-                .Include(x => x.Document)
                 .Include(x => x.Client)
                 .Include(x => x.Implementer)
                 .FirstOrDefault(x => x.Id == model.Id);

LawFirm/LawFirmDatabaseImplement/Models/Order.cs

@@ -31,7 +31,7 @@ namespace LawFirmDatabaseImplement.Models
         public DateTime? DateImplement { get; private set; }
         public virtual Document Document { get; set; }
         public virtual Client Client { get; set; }
-        public virtual Implementer? Implementer { get; set; }
+        public Implementer? Implementer { get; private set; }
 
         public static Order? Create(OrderBindingModel? model)
         {
@@ -67,8 +67,10 @@ namespace LawFirmDatabaseImplement.Models
         public OrderViewModel GetViewModel {
             get
             {
+                var context = new LawFirmDatabase();
                 return new ()
                 {
+
                     DocumentId = DocumentId,
                     ClientId = ClientId,
                     ImplementerId = ImplementerId,
@@ -78,9 +80,9 @@ namespace LawFirmDatabaseImplement.Models
                     DateImplement = DateImplement,
                     Id = Id,
                     Status = Status,
-                    DocumentName = Document.DocumentName,
+                    DocumentName = context.Documents.FirstOrDefault(x => x.Id == DocumentId)?.DocumentName ?? string.Empty,
-                    ClientFIO = Client.ClientFIO,
+                    ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
-                    ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
+                    ImplementerFIO = context.Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO?? string.Empty,
                 };
             }
         }