From d258735aaeef07fdcaf6ce30d97b918ec6f07e46 Mon Sep 17 00:00:00 2001
From: m1aksim1 <kosheevmaksim228@gmail.com>
Date: Mon, 6 Mar 2023 23:49:01 +0400
Subject: [PATCH] fix

---
 .../SoftwareInstallationDatabaseImplement/Order.cs     |  2 +-
 .../OrderStorage.cs                                    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs
index 39f875f..024c1b5 100644
--- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs
+++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs
@@ -68,7 +68,7 @@ namespace SoftwareInstallationDatabaseImplement.Models
                 var context = new SoftwareInstallationDatabase();
                 return new()
                 {
-                    PackageName = context.Packages.FirstOrDefault(x => x.Id == PackageId)?.PackageName ?? string.Empty,
+                    PackageName = Package?.PackageName ?? string.Empty,
                     PackageId = PackageId,
                     Count = Count,
                     Sum = Sum,
diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/OrderStorage.cs
index 758e0ec..591305a 100644
--- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/OrderStorage.cs
+++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/OrderStorage.cs
@@ -1,4 +1,5 @@
-using SoftwareInstallationContracts.BindingModels;
+using Microsoft.EntityFrameworkCore;
+using SoftwareInstallationContracts.BindingModels;
 using SoftwareInstallationContracts.SearchModels;
 using SoftwareInstallationContracts.StoragesContracts;
 using SoftwareInstallationContracts.ViewModels;
@@ -28,7 +29,9 @@ namespace SoftwareInstallationDatabaseImplement.Implements
             {
                 return null;
             }
-            return context.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
+            return context.Orders
+                .Include(x => x.Package)
+                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -41,6 +44,7 @@ namespace SoftwareInstallationDatabaseImplement.Implements
         {
             using var context = new SoftwareInstallationDatabase();
             return context.Orders
+                .Include(x => x.Package)
                 .Select(x => x.GetViewModel)
                 .ToList();
         }
@@ -61,7 +65,7 @@ namespace SoftwareInstallationDatabaseImplement.Implements
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new SoftwareInstallationDatabase();
-            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
+            var order = context.Orders.Include(x => x.Package).FirstOrDefault(x => x.Id == model.Id);
             if (order == null)
             {
                 return null;