Исправлено хранилище заказов

ConfectioneryDatabaseImplement/OrderStorage.cs

@@ -4,7 +4,6 @@ using ConfectioneryContracts.StoragesContract;
 using ConfectioneryContracts.ViewModels;
 using ConfectioneryDatabaseImplement.Models;
 using Microsoft.EntityFrameworkCore;
-using System.Security.Cryptography.X509Certificates;
 
 namespace ConfectioneryDatabaseImplement.Implements
 {
@@ -13,7 +12,10 @@ namespace ConfectioneryDatabaseImplement.Implements
         public OrderViewModel? Delete(OrderBindingModel model)
         {
             using var context = new ConfectioneryDatabase();
-            var element = context.Orders.Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id);
+            var element = context.Orders
+                .Include(x => x.Client)
+				.Include(x => x.Implementer)
+                .FirstOrDefault(x => x.Id == model.Id);
             if (element != null)
             {
                 context.Orders.Remove(element);
@@ -26,52 +28,51 @@ namespace ConfectioneryDatabaseImplement.Implements
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
             using var context = new ConfectioneryDatabase();
-			if (model.ImplementerId.HasValue)
+            // Находим первого либо по айди заказа, либо по айди исполнителя, исходя из того что есть в модели
-			{
+			return context.Orders
-				return context.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+					.Include(x => x.Client)
-			}
+					.Include(x => x.Implementer)
-			if (!model.Id.HasValue)
+					.FirstOrDefault(x =>
-            {
+						model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
-                return null;
+                        model.Id.HasValue            && x.Id == model.Id
-            }
+                    )
-            return context.Orders
+					?.GetViewModel;
-                .Include(x => x.Client)
-                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
-                ?.GetViewModel;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (model.Id.HasValue)
+			if (model.Id.HasValue)
-            {
-                var result = GetElement(model);
-                return result != null ? new() { result } : new();
-            }
-            using var context = new ConfectioneryDatabase();
-            if (model.DateFrom.HasValue && model.DateTo.HasValue) // если не ищем по айдишнику, значит ищем по диапазону дат
-            {
-                return context.Orders
-                    .Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
-				    .Include(x => x.Client)
-					.Select(x => x.GetViewModel)
-                    .ToList();
-            }
-			if (model.Status.HasValue)
 			{
-				return context.Orders
+				var result = GetElement(model);
-					.Where(x => x.Status == model.Status)
+				return result != null ? new() { result } : new();
+			}
+
+			using var context = new ConfectioneryDatabase();
+			IQueryable<Order>? queryWhere = null;
+
+			if (model.DateFrom.HasValue && model.DateTo.HasValue) // если не ищем по айдишнику, значит ищем по диапазону дат
+			{
+				queryWhere = context.Orders
+					.Where(x => model.DateFrom <= x.DateCreate.Date &&
+												  x.DateCreate.Date <= model.DateTo);
+			}
+			else if (model.Status.HasValue)
+			{
+				queryWhere = context.Orders.Where(x => x.Status == model.Status);
+			}
+			else if (model.ClientId.HasValue)
+			{
+				queryWhere = context.Orders.Where(x => x.Client.Id == model.ClientId);
+			}
+			else
+			{
+				return new();
+			}
+			return queryWhere
+					.Include(x => x.Client)
+					.Include(x => x.Implementer)
 					.Select(x => x.GetViewModel)
 					.ToList();
-			}
-			if (model.ClientId.HasValue)
-            {
-                return context.Orders
-					.Where(x => x.Client.Id == model.ClientId)
-				    .Include(x => x.Client)
-                    .Select(x => x.GetViewModel) 
-                    .ToList();
-            }
-            return new();
         }
 
         public List<OrderViewModel> GetFullList()
@@ -79,7 +80,8 @@ namespace ConfectioneryDatabaseImplement.Implements
             using var context = new ConfectioneryDatabase();
             return context.Orders
                 .Include(x => x.Client)
-                .Select(x => x.GetViewModel)
+				.Include(x => x.Implementer)
+				.Select(x => x.GetViewModel)
                 .ToList();
         }
 
@@ -101,7 +103,8 @@ namespace ConfectioneryDatabaseImplement.Implements
             using var context = new ConfectioneryDatabase();
             var order = context.Orders
                 .Include(x => x.Client)
-                .FirstOrDefault(x => x.Id == model.Id);
+				.Include(x => x.Implementer)
+				.FirstOrDefault(x => x.Id == model.Id);
             if (order == null)
             {
                 return null;