Egor_Petrushin/PIbd-22_Petrushin_E.A._LawFirm
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

финал

Browse Source
This commit is contained in:
GokaPek 2024-03-27 10:54:50 +04:00
parent 41531f9761
commit e184ca408d
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
LawFirm/AbstractLawFirmDatabaseImplement/Implements/OrderStorage.cs
View File

@ -35,9 +35,7 @@ namespace AbstractLawFirmDatabaseImplement.Implements
return null; return null;
} }
using var context = new AbstractLawFirmDataBase(); using var context = new AbstractLawFirmDataBase();
return context.Orders return context.Orders.Include(x => x.Document).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
.FirstOrDefault(x =>
(model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@ -49,16 +47,15 @@ namespace AbstractLawFirmDatabaseImplement.Implements
using var context = new AbstractLawFirmDataBase(); using var context = new AbstractLawFirmDataBase();
return context.Orders return context.Orders
.Where(x => x.Id == model.Id) .Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel) .Include(x => x.Document)
.ToList(); .Select(x => x.GetViewModel)
.ToList();
} }
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
using var context = new AbstractLawFirmDataBase(); using var context = new AbstractLawFirmDataBase();
return context.Orders return context.Orders.Include(x => x.Document).Select(x => x.GetViewModel).ToList();
.Select(x => x.GetViewModel)
.ToList();
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)
@ -71,7 +68,7 @@ namespace AbstractLawFirmDatabaseImplement.Implements
using var context = new AbstractLawFirmDataBase(); using var context = new AbstractLawFirmDataBase();
context.Orders.Add(newOrder); context.Orders.Add(newOrder);
context.SaveChanges(); context.SaveChanges();
return newOrder.GetViewModel; return context.Orders.Include(x => x.Document).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
} }
public OrderViewModel? Update(OrderBindingModel model) public OrderViewModel? Update(OrderBindingModel model)
@ -84,7 +81,7 @@ namespace AbstractLawFirmDatabaseImplement.Implements
} }
component.Update(model); component.Update(model);
context.SaveChanges(); context.SaveChanges();
return component.GetViewModel; return context.Orders.Include(x => x.Document).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
} }
} }
} }

2
LawFirm/AbstractLawFirmDatabaseImplement/Models/Order.cs
View File

@ -14,6 +14,7 @@ namespace AbstractLawFirmDataBaseImplement.Models
{ {
public int Id { get; private set; } public int Id { get; private set; }
public int DocumentId { get; private set; } public int DocumentId { get; private set; }
public virtual Document? Document { get; private set; }
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }
public OrderStatus Status { get; private set; } public OrderStatus Status { get; private set; }
@ -54,6 +55,7 @@ namespace AbstractLawFirmDataBaseImplement.Models
{ {
Id = Id, Id = Id,
DocumentId = DocumentId, DocumentId = DocumentId,
DocumentName = Document.DocumentName,
Count = Count, Count = Count,
Sum = Sum, Sum = Sum,
Status = Status, Status = Status,