From a03f0c7e695415c62896038a155280270464d86d Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Fri, 12 Apr 2024 21:44:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20PR=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/OrderStorage.cs | 5 +++-- .../SoftwareInstallationDatabaseImplement/Models/Order.cs | 1 + .../Implements/OrderStorage.cs | 8 +++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs index 4219c63..61cef47 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implements/OrderStorage.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; namespace SoftwareInstallationDatabaseImplement.Implements { @@ -51,14 +52,14 @@ namespace SoftwareInstallationDatabaseImplement.Implements using var context = new SoftwareInstallationDatabase(); - return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); + return context.Orders.Include(x => x.Package).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); } public List GetFullList() { using var context = new SoftwareInstallationDatabase(); - return context.Orders.Select(x => x.GetViewModel).Select(x => GetPackageName(x)).ToList(); + return context.Orders.Include(x => x.Package).Select(x => x.GetViewModel).ToList(); } public OrderViewModel? Insert(OrderBindingModel model) diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs index c8b7df7..0303f0d 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Models/Order.cs @@ -66,6 +66,7 @@ namespace SoftwareInstallationDatabaseImplement.Models { Id = Id, PackageId = PackageId, + PackageName = Package.PackageName, Count = Count, Sum = Sum, Status = Status, diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs index b555ea6..39ef51f 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs @@ -92,12 +92,10 @@ namespace SoftwareInstallationFileImplement.Implements } private OrderViewModel GetPackageName(OrderViewModel viewModel) { - foreach (var package in source.Packages) + var package = source.Packages.FirstOrDefault(x => x.Id == viewModel.PackageId); + if (package != null) { - if (package.Id == viewModel.PackageId) - { - viewModel.PackageName = package.PackageName; - } + viewModel.PackageName = package.PackageName; } return viewModel; }