From 33e0d1f75050e75ea59aa27e737a67038f083af7 Mon Sep 17 00:00:00 2001
From: Danila_Mochalov <volzhankaonelove@yandex.ru>
Date: Mon, 10 Apr 2023 10:44:37 +0400
Subject: [PATCH] fix

---
 .../Implements/OrderStorage.cs                     | 14 ++++++++------
 LawFirm/LawFirmDatabaseImplement/Models/Order.cs   |  9 ++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
index d1f1c23..6a6127d 100644
--- a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
+++ b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
@@ -44,7 +44,6 @@ namespace LawFirmDatabaseImplement.Implements
                     .Include(x => x.Client)
                     .Include(x => x.Implementer)
 					.Include(x => x.Document)
-					.Include(x => x.Client)
                     .Where(x => x.ClientId == model.ClientId)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -52,7 +51,8 @@ namespace LawFirmDatabaseImplement.Implements
             if (model.Status!= null)
             {
                 return context.Orders
-                    .Include(x => x.Client)
+					.Include(x => x.Document)
+					.Include(x => x.Client)
                     .Include(x => x.Implementer)
                     .Where(x => model.Status.Equals(x.Status))
                     .Select(x => x.GetViewModel)
@@ -60,7 +60,8 @@ namespace LawFirmDatabaseImplement.Implements
             }
             return context.Orders
                 .Include(x => x.Document)
-                .Include(x => x.Implementer)
+				.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)
                 .ToList();
@@ -69,7 +70,7 @@ namespace LawFirmDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new LawFirmDatabase();
-            return context.Orders.Include(x => x.Document).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Document).Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel).ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -82,7 +83,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).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
+            return context.Orders.Include(x => x.Document).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -95,12 +96,13 @@ namespace LawFirmDatabaseImplement.Implements
             }
             order.Update(model);
             context.SaveChanges();
-            return context.Orders.Include(x => x.Document).Include(x => x.Implementer).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+            return context.Orders.Include(x => x.Document).Include(x => x.Client).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);
diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs
index acbefa6..c2c3801 100644
--- a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs
+++ b/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 Implementer? Implementer { get; private set; }
+        public virtual Implementer? Implementer { get; set; }
 
         public static Order? Create(OrderBindingModel? model)
         {
@@ -69,7 +69,6 @@ namespace LawFirmDatabaseImplement.Models
             {
                 return new ()
                 {
-
                     DocumentId = DocumentId,
                     ClientId = ClientId,
                     ImplementerId = ImplementerId,
@@ -79,9 +78,9 @@ namespace LawFirmDatabaseImplement.Models
                     DateImplement = DateImplement,
                     Id = Id,
                     Status = Status,
-                    DocumentName = context.Documents.FirstOrDefault(x => x.Id == DocumentId)?.DocumentName ?? string.Empty,
-                    ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
-                    ImplementerFIO = context.Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO?? string.Empty,
+                    DocumentName = Document.DocumentName,
+                    ClientFIO = Client.ClientFIO,
+                    ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
                 };
             }
         }