1maksim1/ISEbd-21_Koscheev.M.S.SoftwareInstallation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
m1aksim1 2023-03-06 23:49:01 +04:00
parent 25607a573b
commit d258735aae
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs
View File

@ -68,7 +68,7 @@ namespace SoftwareInstallationDatabaseImplement.Models
var context = new SoftwareInstallationDatabase(); var context = new SoftwareInstallationDatabase();
return new() return new()
{ {
PackageName = context.Packages.FirstOrDefault(x => x.Id == PackageId)?.PackageName ?? string.Empty, PackageName = Package?.PackageName ?? string.Empty,
PackageId = PackageId, PackageId = PackageId,
Count = Count, Count = Count,
Sum = Sum, Sum = Sum,

10
SoftwareInstallation/SoftwareInstallationDatabaseImplement/OrderStorage.cs
View File

@ -1,4 +1,5 @@
using SoftwareInstallationContracts.BindingModels; using Microsoft.EntityFrameworkCore;
using SoftwareInstallationContracts.BindingModels;
using SoftwareInstallationContracts.SearchModels; using SoftwareInstallationContracts.SearchModels;
using SoftwareInstallationContracts.StoragesContracts; using SoftwareInstallationContracts.StoragesContracts;
using SoftwareInstallationContracts.ViewModels; using SoftwareInstallationContracts.ViewModels;
@ -28,7 +29,9 @@ namespace SoftwareInstallationDatabaseImplement.Implements
{ {
return null; 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) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@ -41,6 +44,7 @@ namespace SoftwareInstallationDatabaseImplement.Implements
{ {
using var context = new SoftwareInstallationDatabase(); using var context = new SoftwareInstallationDatabase();
return context.Orders return context.Orders
.Include(x => x.Package)
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
@ -61,7 +65,7 @@ namespace SoftwareInstallationDatabaseImplement.Implements
public OrderViewModel? Update(OrderBindingModel model) public OrderViewModel? Update(OrderBindingModel model)
{ {
using var context = new SoftwareInstallationDatabase(); 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) if (order == null)
{ {
return null; return null;