ns.potapov/PIbd-21_Potapov_N.S._SecuritySystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Фикс хранилища заказов для отображения исполнителя

Browse Source
This commit is contained in:
Никита Потапов 2024-04-22 12:25:56 +04:00
parent 5786cfdc95
commit ac5c359c5f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs
View File

@ -16,18 +16,12 @@ namespace SecuritySystemDatabaseImplement.Implements
return null;
}
using var context = new SecuritySystemDatabase();
return context.Orders.Include(x => x.Secure).Include(x => x.Client).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
return GetFullList().FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id));
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
using var context = new SecuritySystemDatabase();
var orders = context.Orders
.Include(x => x.Secure)
.Include(x => x.Client)
.Include(x => x.Implementer)
.Select(x => x.GetViewModel)
.ToList();
var orders = GetFullList();
if (model.Id.HasValue)
{
orders = orders.Where(x => x.Id == model.Id.Value).ToList();
@ -58,7 +52,12 @@ namespace SecuritySystemDatabaseImplement.Implements
public List<OrderViewModel> GetFullList()
{
using var context = new SecuritySystemDatabase();
return context.Orders.Include(x => x.Secure).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
return context.Orders
.Include(x => x.Secure)
.Include(x => x.Client)
.Include(x => x.Implementer)
.Select(x => x.GetViewModel)
.ToList();
}
public OrderViewModel? Insert(OrderBindingModel model)
@ -71,7 +70,7 @@ namespace SecuritySystemDatabaseImplement.Implements
using var context = new SecuritySystemDatabase();
context.Orders.Add(newOrder);
context.SaveChanges();
return context.Orders.Include(x => x.Secure).Include(x => x.Client).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
return GetFullList().FirstOrDefault(x => x.Id == newOrder.Id);
}
public OrderViewModel? Update(OrderBindingModel model)
@ -84,7 +83,7 @@ namespace SecuritySystemDatabaseImplement.Implements
}
order.Update(model);
context.SaveChanges();
return context.Orders.Include(x => x.Secure).Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
return GetFullList().FirstOrDefault(x => x.Id == model.Id);
}
public OrderViewModel? Delete(OrderBindingModel model)
{