Nikolay-Raspaev/PIbd-21_Raspaev_N.I._FoodOrders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Николай 2023-03-11 19:28:29 +04:00
parent da162462b5
commit 5dbea38023
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs
View File

@ -24,10 +24,8 @@ namespace FoodOrdersBusinessLogic.BusinessLogics
public List<DishViewModel>? ReadList(DishSearchModel? model) public List<DishViewModel>? ReadList(DishSearchModel? model)
{ {
_logger.LogInformation("ReadList. DishName:{DishName}. Id:{Id}", _logger.LogInformation("ReadList. DishName:{DishName}. Id:{Id}", model?.DishName, model?.Id);
model?.DishName, model?.Id); var list = model == null ? _dishStorage.GetFullList() : _dishStorage.GetFilteredList(model);
var list = model == null ? _dishStorage.GetFullList() :
_dishStorage.GetFilteredList(model);
if (list == null) if (list == null)
{ {
_logger.LogWarning("ReadList return null list"); _logger.LogWarning("ReadList return null list");

7
FoodOrders/FoodOrdersListImplement/Implements/DishStorage.cs
View File

@ -22,8 +22,7 @@ namespace FoodOrdersListImplement.Implements
} }
return result; return result;
} }
public List<DishViewModel> GetFilteredList(DishSearchModel public List<DishViewModel> GetFilteredList(DishSearchModel model)
model)
{ {
var result = new List<DishViewModel>(); var result = new List<DishViewModel>();
if (string.IsNullOrEmpty(model.DishName)) if (string.IsNullOrEmpty(model.DishName))
@ -47,9 +46,7 @@ namespace FoodOrdersListImplement.Implements
} }
foreach (var dish in _source.Dish) foreach (var dish in _source.Dish)
{ {
if ((!string.IsNullOrEmpty(model.DishName) && if ((!string.IsNullOrEmpty(model.DishName) && dish.DishName == model.DishName) || (model.Id.HasValue && dish.Id == model.Id))
dish.DishName == model.DishName) ||
(model.Id.HasValue && dish.Id == model.Id))
{ {
return dish.GetViewModel; return dish.GetViewModel;
} }