safgerd/PIbd-23_Minhasapov_R.H._AutomobilePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LabWork05_Base: Фикс

Browse Source
This commit is contained in:
Safgerd 2023-04-20 20:49:48 +04:00
parent b9bfcda5c1
commit ea0dabdb4c
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/OrderStorage.cs
View File

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

5
AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Order.cs
View File

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