august/PIbd-21_Balberova_D.N._SushiBar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправление реализаций

Browse Source
This commit is contained in:
dasha 2023-03-10 18:35:12 +04:00
parent b63ef37d04
commit 7de3033c77
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,14 +21,14 @@ namespace SushiBarFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue) if (!model.Id.HasValue && !model.DateFrom.HasValue)
{ {
return new(); return new();
} }
if (model.DateFrom.HasValue) if (model.DateFrom.HasValue)
{ {
return source.Orders return source.Orders
.Where(x => x.Id.Equals(model.Id) && x.DateCreate >= model.DateFrom) .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
.Select(x => GetViewModel(x)) .Select(x => GetViewModel(x))
.ToList(); .ToList();
} }

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

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