Merge branch 'LabWork05_Base' into LabWork05_Hard

AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/OrderStorage.cs

@@ -21,8 +21,8 @@ namespace AutomobilePlantDatabaseImplement.Implements
                 return null;
             }
             using var context = new AutomobilePlantDatabase();
-            return context.Orders.Include(x => x.Car).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
+			return context.Orders.Include(x => x.Car).Include(x => x.Client).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+		}
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
@@ -34,14 +34,16 @@ namespace AutomobilePlantDatabaseImplement.Implements
             if (model.ClientId.HasValue)
             {
                 return context.Orders
-                    .Include(x => x.Client)
-                    .Where(x => x.ClientId == model.ClientId)
+                    .Include(x => x.Car)
+					.Include(x => x.Client)
+					.Where(x => x.ClientId == model.ClientId)
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
             return context.Orders
-            .Include(x => x.Car)
-            .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
+			.Include(x => x.Client)
+			.Include(x => x.Car)
+			.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
             .Select(x => x.GetViewModel)
             .ToList();
         }
@@ -49,8 +51,8 @@ namespace AutomobilePlantDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new AutomobilePlantDatabase();
-            return context.Orders.Include(x => x.Car).Select(x => x.GetViewModel).ToList();
-        }
+			return context.Orders.Include(x => x.Car).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
+		}
 
         public OrderViewModel? Insert(OrderBindingModel model)
         {
@@ -62,8 +64,8 @@ namespace AutomobilePlantDatabaseImplement.Implements
             using var context = new AutomobilePlantDatabase();
             context.Orders.Add(newOrder);
             context.SaveChanges();
-            return context.Orders.Include(x => x.Car).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
-        }
+			return context.Orders.Include(x => x.Car).Include(x => x.Client).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
+		}
 
         public OrderViewModel? Update(OrderBindingModel model)
         {
@@ -75,8 +77,8 @@ namespace AutomobilePlantDatabaseImplement.Implements
             }
             order.Update(model);
             context.SaveChanges();
-            return context.Orders.Include(x => x.Car).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-        }
+			return context.Orders.Include(x => x.Car).Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+		}
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new AutomobilePlantDatabase();

AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Order.cs

@@ -67,7 +67,6 @@ namespace AutomobilePlantDatabaseImplement.Models
         {
             get
             {
-                var context = new AutomobilePlantDatabase();
                 return new()
                 {
 
@@ -79,8 +78,8 @@ namespace AutomobilePlantDatabaseImplement.Models
                     DateImplement = DateImplement,
                     Id = Id,
                     Status = Status,
-                    CarName = context.Cars.FirstOrDefault(x => x.Id == CarId)?.CarName ?? string.Empty,
-                    ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty
+                    CarName = Car.CarName,
+                    ClientFIO = Client.ClientFIO
                 };
             }
         }