From 187dfbd01e9ac0073c063c1ef6b8b6afd6e98882 Mon Sep 17 00:00:00 2001
From: kamilia <Admin@DESKTOP-NFSG25N>
Date: Sun, 5 May 2024 22:11:58 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=8B=D1=82=D0=B0=D1=8E=D1=81=D1=8C=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D1=82=D1=8C=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82,=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=BA=D0=B8=20=D0=BD=D0=B5=20=D1=81=D1=81=D0=BE?=
 =?UTF-8?q?=D1=80=D1=8C=D1=82=D0=B5=D1=81=D1=8C=20=D0=BF=D0=B6......?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/OrderStorage.cs                | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs b/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs
index 2d79870..f9b5346 100644
--- a/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs
+++ b/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs
@@ -14,14 +14,13 @@ namespace AircraftPlantDatabaseImplement.Implements
             using var context = new AircraftPlantDatabase();
             return context.Orders
                     .Include(x => x.Plane)
-                    .Include(x => x.Client)
                     .Select(x => x.GetViewModel)
                     .ToList();
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue && !model.ClientId.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue))
+            if (!model.Id.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue))
             {
                 return new();
             }
@@ -30,23 +29,12 @@ namespace AircraftPlantDatabaseImplement.Implements
             {
                 return context.Orders
                     .Include(x => x.Plane)
-                    .Include(x => x.Client)
                     .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
-            if (model.ClientId.HasValue)
-            {
-                return context.Orders
-                    .Include(x => x.Plane)
-                    .Include(x => x.Client)
-                    .Where(x => x.ClientId == model.ClientId)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
             return context.Orders
                     .Include(x => x.Plane)
-                    .Include(x => x.Client)
                     .Where(x => x.Id == model.Id)
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -61,23 +49,24 @@ namespace AircraftPlantDatabaseImplement.Implements
             using var context = new AircraftPlantDatabase();
             return context.Orders
                     .Include(x => x.Plane)
-                    .Include(x => x.Client)
                     .FirstOrDefault(x => x.Id == model.Id)
                     ?.GetViewModel;
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
         {
-            using var context = new AircraftPlantDatabase();
-            var newOrder = Order.Create(context, model);
+            var newOrder = Order.Create(model);
             if (newOrder == null)
             {
                 return null;
             }
-
+            using var context = new AircraftPlantDatabase();
             context.Orders.Add(newOrder);
             context.SaveChanges();
-            return newOrder.GetViewModel;
+            return context.Orders
+                      .Include(x => x.Plane)
+                      .FirstOrDefault(x => x.Id == newOrder.Id)
+                      ?.GetViewModel;
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -88,21 +77,27 @@ namespace AircraftPlantDatabaseImplement.Implements
             {
                 return null;
             }
-
             order.Update(model);
             context.SaveChanges();
-            return order.GetViewModel;
+            return context.Orders
+                         .Include(x => x.Plane)
+                         .FirstOrDefault(x => x.Id == model.Id)
+                         ?.GetViewModel;
         }
 
-         public OrderViewModel? Delete(OrderBindingModel model)
+        public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new AircraftPlantDatabase();
-            var element = context.Orders.FirstOrDefault(x => x.Id == model.Id);
+            var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
             if (element != null)
             {
+                var deletedElement = context.Orders
+                                           .Include(x => x.Plane)
+                                           .FirstOrDefault(x => x.Id == model.Id)
+                                           ?.GetViewModel;
                 context.Orders.Remove(element);
                 context.SaveChanges();
-                return element.GetViewModel;
+                return deletedElement;
             }
             return null;
         }