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 +15 -11
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57e9a8a6b8 - Show all commits

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

@ -15,7 +15,9 @@ namespace SushiBarFileImplement.Implements
}
public List<OrderViewModel> GetFullList()
{
return source.Orders.Select(x => AttachSushiName(x.GetViewModel)).ToList();
return source.Orders
.Select(x => AttachSushiName(x.GetViewModel))
.ToList();
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
@ -23,9 +25,13 @@ namespace SushiBarFileImplement.Implements
{
return new();
}
return source.Orders.Where(x =>
x.Id == model.Id).Select(x =>
AttachSushiName(x.GetViewModel)).ToList();
return source.Orders
.Where(o =>
(model.Id.HasValue && o.Id == model.Id) ||
(model.DateFrom.HasValue && model.DateTo.HasValue &&
model.DateFrom < o.DateCreate && o.DateCreate < model.DateTo))
.Select(x => AttachSushiName(x.GetViewModel))
.ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
@ -33,8 +39,8 @@ namespace SushiBarFileImplement.Implements
{
return null;
}
return AttachSushiName(source.Orders.FirstOrDefault(x =>
(x.Id == model.Id))?.GetViewModel);
return AttachSushiName(source.Orders
.FirstOrDefault(x => (x.Id == model.Id))?.GetViewModel);
}
public OrderViewModel? Insert(OrderBindingModel model)
{

8
SushiBar/SushiBarListImplement/Implements/OrderStorage.cs
View File

@ -25,13 +25,11 @@ namespace SushiBarListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
var result = new List<OrderViewModel>();
if (model == null || !model.Id.HasValue)
{
return result;
}
foreach (var order in _source.Orders)
{
if (order.Id == model.Id)
if (order.Id == model.Id ||
(model.DateFrom.HasValue && model.DateTo.HasValue &&
model.DateFrom < order.DateCreate && order.DateCreate < model.DateTo)))
{
result.Add(AttachSushiName(order.GetViewModel));
}