bekodeg/SushiBarBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-22 Боровков М В 5 лабораторная работа #6

Closed
bekodeg wants to merge 44 commits from labWork5 into labWork4
pull from: labWork5
merge into: bekodeg:labWork4
Conversation 0 Commits 44 Files Changed 62 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51bfe86353 - Show all commits

20
SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs
View File

@ -15,7 +15,7 @@ namespace SushiBarFileImplement.Implements
} }
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
return source.Orders.Select(x => x.GetViewModel).ToList(); return source.Orders.Select(x => AttachSushiName(x.GetViewModel)).ToList();
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
@ -25,7 +25,7 @@ namespace SushiBarFileImplement.Implements
} }
return source.Orders.Where(x => return source.Orders.Where(x =>
x.Id == model.Id).Select(x => x.Id == model.Id).Select(x =>
x.GetViewModel).ToList(); AttachSushiName(x.GetViewModel)).ToList();
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
@ -33,8 +33,8 @@ namespace SushiBarFileImplement.Implements
{ {
return null; return null;
} }
return source.Orders.FirstOrDefault(x => return AttachSushiName(source.Orders.FirstOrDefault(x =>
(x.Id == model.Id))?.GetViewModel; (x.Id == model.Id))?.GetViewModel);
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)
{ {
@ -46,7 +46,7 @@ namespace SushiBarFileImplement.Implements
} }
source.Orders.Add(newOrder); source.Orders.Add(newOrder);
source.SaveOrders(); source.SaveOrders();
return newOrder.GetViewModel; return AttachSushiName(newOrder.GetViewModel);
} }
public OrderViewModel? Update(OrderBindingModel model) public OrderViewModel? Update(OrderBindingModel model)
{ {
@ -57,7 +57,7 @@ namespace SushiBarFileImplement.Implements
} }
order.Update(model); order.Update(model);
source.SaveOrders(); source.SaveOrders();
return order.GetViewModel; return AttachSushiName(order.GetViewModel);
} }
public OrderViewModel? Delete(OrderBindingModel model) public OrderViewModel? Delete(OrderBindingModel model)
{ {
@ -66,9 +66,15 @@ namespace SushiBarFileImplement.Implements
{ {
source.Orders.Remove(element); source.Orders.Remove(element);
source.SaveOrders(); source.SaveOrders();
return element.GetViewModel; return AttachSushiName(element.GetViewModel);
} }
return null; return null;
} }
private OrderViewModel AttachSushiName(OrderViewModel model)
{
if (model == null) { return null; }
model.SushiName = source.Sushis.First(x => x.Id == model.SushiId).SushiName;
return model;
}
} }
} }

2
SushiBar/SushiBarFileImplement/Models/Order.cs
View File

@ -45,7 +45,7 @@ namespace SushiBarFileImplement.Models
} }
return new Order() return new Order()
{ {
Id = Convert.ToInt32(element.Attribute("id")!.Value), Id = Convert.ToInt32(element.Attribute("Id")!.Value),
SushiId = Convert.ToInt32(element.Element("SushiId")!.Value), SushiId = Convert.ToInt32(element.Element("SushiId")!.Value),
Count = Convert.ToInt32(element.Element("Count")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value),
Sum = Convert.ToDouble(element.Element("Sum")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value),