diff --git a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs index 6fc3deb..bc85835 100644 --- a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs +++ b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs @@ -29,12 +29,12 @@ namespace ComputersShopFileImplements.Implements return new(); } return source.Orders - .Where(x => x.Id == model.Id || - model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo || - x.ClientId == model.ClientId || - model.Status.Equals(x.Status)) - .Select(x => GetViewModel(x)) - .ToList(); + .Where(x => x.Id == model.Id || + model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo || + x.ClientId == model.ClientId || + model.Status.Equals(x.Status)) + .Select(x => GetViewModel(x)) + .ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) { diff --git a/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs b/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs index 0b2f806..34b6e25 100644 --- a/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs +++ b/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs @@ -22,14 +22,14 @@ namespace ComputersShopDatabaseImplements.Implements } using var context = new ComputersShopDatabase(); return context.Orders - .Include(x => x.Computer) - .Include(x => x.Client) - .Include(x => x.Implementer) - .FirstOrDefault(x => - (model.Status == null || model.Status != null && model.Status.Equals(x.Status)) && - (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) || - (model.Id.HasValue && x.Id == model.Id))? - .GetViewModel; + .Include(x => x.Computer) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => + (model.Status == null || model.Status != null && model.Status.Equals(x.Status)) && + (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) || + (model.Id.HasValue && x.Id == model.Id))? + .GetViewModel; } public List GetFiltredList(OrderSearchModel model) {