From f25de886e985b1d2d7a19b143ba234597881903e Mon Sep 17 00:00:00 2001 From: frog24 Date: Sat, 18 May 2024 18:09:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=B8=D0=B7-=D0=B7=D0=B0?= =?UTF-8?q?=20=D1=82=D0=B0=D0=B1=D1=83=D0=BB=D1=8F=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB=D0=BE=D1=81=D1=8C(=D0=B6?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/OrderStorage.cs | 12 ++++++------ .../Implements/OrderStorage.cs | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) 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) {